feat: added residential GBs and residential GBs per request

Author: metalwarrior665

starter/src/startRunAndPool.ts

@@ -1,6 +1,6 @@
-import { Actor } from 'apify';
+import { Actor, ActorRun } from 'apify';
 
-import type { PreparedActorConfig, ActorCheckSimplifiedOutput } from './typedefs.js';
+import type { PreparedActorConfig, ActorCheckSimplifiedOutput, FixedActorRun } from './typedefs.js';
 
 export async function startRun(run: PreparedActorConfig) {
     const client = Actor.newClient();
@@ -13,13 +13,20 @@ export async function waitForRunToFinishAndPushData(runConfig: PreparedActorConf
     const client = Actor.newClient();
     const run = client.run(runConfig.runId!);
 
-    const finishedRun = await run.waitForFinish();
-    const { computeUnits } = finishedRun.stats;
+    const finishedRun = await run.waitForFinish() as FixedActorRun;
+    const {
+        ACTOR_COMPUTE_UNITS: computeUnits,
+        PROXY_RESIDENTIAL_TRANSFER_GBYTES: residentialGBs,
+    } = finishedRun.usage;
 
     const value = (await run.keyValueStore().getRecord('OUTPUT'))!.value as ActorCheckSimplifiedOutput;
 
     value.computeUnitsUsedForThisCheck = Number(computeUnits.toFixed(4));
     value.pagesPerComputeUnit = Number((value.totalPages / computeUnits).toFixed(2));
+    value.computeUnitsPerRequest = Number((computeUnits / value.totalPages).toFixed(6));
+    // 8 decimals gives all the precision we need (level of 10 Bytes)
+    value.residentialGBs = Number(residentialGBs.toFixed(8));
+    value.residentialGBsPerRequest = Number((residentialGBs / value.totalPages).toFixed(8));
     value.proxyUsed = runConfig.proxyUsed;
 
     if (runConfig.input['playwright.chrome']) {

starter/src/typedefs.ts

@@ -1,3 +1,5 @@
+import { ActorRun } from "apify";
+
 export interface FrontendActorState {
     totalUrls: number;
     runConfigurations: PreparedActorConfig[];
@@ -99,7 +101,10 @@ export interface ActorCheckDetailedOutput {
     playwrightBrowser?: 'chrome' | 'firefox' | 'webkit';
     computeUnitsUsedForThisCheck?: number;
     // (totalPages.length / computeUnitsUsedForThisCheck) yields the amount of pages checkable per compute unit
-    pagesPerComputeUnit?: number;
+    pagesPerComputeUnit: number;
+    computeUnitsPerRequest: number;
+    residentialGBs: number;
+    residentialGBsPerRequest: number;
 
     // URLs
     url: string;
@@ -133,3 +138,20 @@ export type ActorCheckSimplifiedOutput = {
                 ? Record<number, number>
                 : ActorCheckDetailedOutput[K];
 };
+
+export interface FixedActorRun extends ActorRun {
+    usage: {
+        ACTOR_COMPUTE_UNITS: number,
+        DATASET_READS: number,
+        DATASET_WRITES: number,
+        KEY_VALUE_STORE_READS: number,
+        KEY_VALUE_STORE_WRITES: number,
+        KEY_VALUE_STORE_LISTS: number,
+        REQUEST_QUEUE_READS: number,
+        REQUEST_QUEUE_WRITES: number,
+        DATA_TRANSFER_INTERNAL_GBYTES: number,
+        DATA_TRANSFER_EXTERNAL_GBYTES: number,
+        PROXY_RESIDENTIAL_TRANSFER_GBYTES: number,
+        PROXY_SERPS: number,
+    }
+};