fix: ensure maxTotalChargeUsd is correctly mapped to number, consider empty string as infinity (#361)

Author: B4nan

package-lock.json

@@ -62,11 +62,11 @@
         "@crawlee/core": "^3.9.0",
         "@crawlee/types": "^3.9.0",
         "@crawlee/utils": "^3.9.0",
-        "apify-client": "^2.11.1",
+        "apify-client": "^2.12.0",
         "fs-extra": "^11.2.0",
         "ow": "^0.28.2",
         "semver": "^7.5.4",
         "tslib": "^2.6.2",
         "ws": "^8.18.0"
     }
-}
+}

packages/apify/package.json

@@ -26,10 +26,7 @@ export class ChargingManager {
     private apifyClient: ApifyClient;
 
     constructor(configuration: Configuration, apifyClient: ApifyClient) {
-        this.maxTotalChargeUsd = configuration.get('maxTotalChargeUsd') ?? Infinity;
-        if (typeof this.maxTotalChargeUsd === 'string') { // TODO workaround for incorrect Configuration class behavior
-            this.maxTotalChargeUsd = Infinity;
-        }
+        this.maxTotalChargeUsd = configuration.get('maxTotalChargeUsd') || Infinity; // convert `0` to `Infinity` in case the value is an empty string
         this.isAtHome = configuration.get('isAtHome');
         this.actorRunId = configuration.get('actorRunId');
         this.purgeChargingLogDataset = configuration.get('purgeOnStart');

packages/apify/src/charging.ts

@@ -172,7 +172,7 @@ export class Configuration extends CoreConfiguration {
         ACTOR_USE_CHARGING_LOG_DATASET: 'useChargingLogDataset',
     };
 
-    protected static override INTEGER_VARS = [...super.INTEGER_VARS, 'proxyPort', 'containerPort', 'metamorphAfterSleepMillis'];
+    protected static override INTEGER_VARS = [...super.INTEGER_VARS, 'proxyPort', 'containerPort', 'metamorphAfterSleepMillis', 'maxTotalChargeUsd'];
 
     protected static override BOOLEAN_VARS = [...super.BOOLEAN_VARS, 'isAtHome', 'testPayPerEvent', 'useChargingLogDataset'];
 

packages/apify/src/configuration.ts

@@ -612,6 +612,7 @@ describe('Actor', () => {
                 expect(openStorageSpy).toBeCalledWith(queueId, sdk.apifyClient);
                 expect(openStorageSpy).toBeCalledTimes(1);
 
+                // @ts-expect-error private prop
                 expect(queue.initialCount).toBe(10);
             });
 
@@ -1030,4 +1031,18 @@ describe('Actor', () => {
             expect(pushDataSpy).toHaveBeenCalledWith({ hello: 'apify' });
         });
     });
+
+    describe('Actor.config and PPE', () => {
+        test('should work', async () => {
+            await Actor.init();
+            process.env.ACTOR_MAX_TOTAL_CHARGE_USD = '';
+            expect(Actor.config.get('maxTotalChargeUsd')).toBe(0);
+            expect(Actor.getChargingManager().getMaxTotalChargeUsd()).toBe(Infinity);
+
+            // the value in charging manager is cached, so we cant test that here
+            process.env.ACTOR_MAX_TOTAL_CHARGE_USD = '123';
+            expect(Actor.config.get('maxTotalChargeUsd')).toBe(123);
+            await Actor.exit({ exit: false });
+        });
+    });
 });