@apify/actors-mcp-server 0.16.1-beta.0 → 0.16.1-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -0
- package/dist/const.d.ts +2 -0
- package/dist/const.d.ts.map +1 -1
- package/dist/const.js +2 -0
- package/dist/const.js.map +1 -1
- package/dist/index_internals.d.ts +2 -0
- package/dist/index_internals.d.ts.map +1 -1
- package/dist/mcp/tool_call_engine.d.ts.map +1 -1
- package/dist/mcp/tool_call_engine.js +9 -5
- package/dist/mcp/tool_call_engine.js.map +1 -1
- package/dist/payments/const.d.ts +1 -1
- package/dist/payments/const.d.ts.map +1 -1
- package/dist/payments/const.js +3 -1
- package/dist/payments/const.js.map +1 -1
- package/dist/test_kit/tsconfig.tsbuildinfo +1 -1
- package/dist/tools/actors/actor_run_response.d.ts +7 -0
- package/dist/tools/actors/actor_run_response.d.ts.map +1 -1
- package/dist/tools/actors/actor_run_response.js +2 -2
- package/dist/tools/actors/actor_run_response.js.map +1 -1
- package/dist/tools/actors/call_actor.js +1 -1
- package/dist/tools/builds/build_helpers.d.ts +63 -0
- package/dist/tools/builds/build_helpers.d.ts.map +1 -0
- package/dist/tools/builds/build_helpers.js +102 -0
- package/dist/tools/builds/build_helpers.js.map +1 -0
- package/dist/tools/builds/get_actor_build.d.ts +7 -0
- package/dist/tools/builds/get_actor_build.d.ts.map +1 -0
- package/dist/tools/builds/get_actor_build.js +75 -0
- package/dist/tools/builds/get_actor_build.js.map +1 -0
- package/dist/tools/builds/get_actor_build_log.d.ts +7 -0
- package/dist/tools/builds/get_actor_build_log.d.ts.map +1 -0
- package/dist/tools/builds/get_actor_build_log.js +64 -0
- package/dist/tools/builds/get_actor_build_log.js.map +1 -0
- package/dist/tools/registry.d.ts +1 -0
- package/dist/tools/registry.d.ts.map +1 -1
- package/dist/tools/registry.js +3 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/structured_output_schemas.d.ts +56 -0
- package/dist/tools/structured_output_schemas.d.ts.map +1 -1
- package/dist/tools/structured_output_schemas.js +35 -0
- package/dist/tools/structured_output_schemas.js.map +1 -1
- package/dist/tools/tasks/publish_actor_task.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/console_link.d.ts +5 -0
- package/dist/utils/console_link.d.ts.map +1 -1
- package/dist/utils/console_link.js +7 -0
- package/dist/utils/console_link.js.map +1 -1
- package/dist/utils/progress.d.ts +13 -0
- package/dist/utils/progress.d.ts.map +1 -1
- package/dist/utils/progress.js +34 -15
- package/dist/utils/progress.js.map +1 -1
- package/package.json +1 -1
|
@@ -18,6 +18,11 @@ export declare function getConsoleLinkContext(apifyToken: string | undefined, ap
|
|
|
18
18
|
export declare function buildConsoleActorUrl(context: ConsoleLinkContext | undefined, actorId: string): string | undefined;
|
|
19
19
|
/** Builds the Console run detail URL: `<consoleBaseUrl>[/organization/<orgId>]/actors/runs/<runId>`. */
|
|
20
20
|
export declare function buildConsoleRunUrl(context: ConsoleLinkContext | undefined, runId: string): string | undefined;
|
|
21
|
+
/**
|
|
22
|
+
* Builds the Console build detail URL: `<consoleBaseUrl>[/organization/<orgId>]/actors/<actorId>/builds/<buildNumber>`.
|
|
23
|
+
* Console resolves builds by number, not by ID (the CLI links the same way); a build ID in the path 404s.
|
|
24
|
+
*/
|
|
25
|
+
export declare function buildConsoleBuildUrl(context: ConsoleLinkContext | undefined, actorId: string, buildNumber: string): string | undefined;
|
|
21
26
|
/** Builds the Console dataset URL: `<consoleBaseUrl>[/organization/<orgId>]/storage/datasets/<datasetId>`. */
|
|
22
27
|
export declare function buildConsoleDatasetUrl(context: ConsoleLinkContext | undefined, datasetId: string): string | undefined;
|
|
23
28
|
/** Builds the Console key-value store URL: `<consoleBaseUrl>[/organization/<orgId>]/storage/key-value-stores/<storeId>`. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console_link.d.ts","sourceRoot":"","sources":["../../src/utils/console_link.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAatD,eAAO,MAAM,oBAAoB,mHACmF,CAAC;AAErH;;;;;;;;;;;GAWG;AACH,wBAAsB,qBAAqB,CACvC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAIzC;AAaD,uGAAuG;AACvG,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEjH;AAED,wGAAwG;AACxG,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE7G;AAED,8GAA8G;AAC9G,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAErH;AAED,4HAA4H;AAC5H,wBAAgB,4BAA4B,CACxC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EACvC,OAAO,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAEpB"}
|
|
1
|
+
{"version":3,"file":"console_link.d.ts","sourceRoot":"","sources":["../../src/utils/console_link.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAatD,eAAO,MAAM,oBAAoB,mHACmF,CAAC;AAErH;;;;;;;;;;;GAWG;AACH,wBAAsB,qBAAqB,CACvC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAIzC;AAaD,uGAAuG;AACvG,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEjH;AAED,wGAAwG;AACxG,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE7G;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAChC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EACvC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,GACpB,MAAM,GAAG,SAAS,CAEpB;AAED,8GAA8G;AAC9G,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAErH;AAED,4HAA4H;AAC5H,wBAAgB,4BAA4B,CACxC,OAAO,EAAE,kBAAkB,GAAG,SAAS,EACvC,OAAO,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAEpB"}
|
|
@@ -46,6 +46,13 @@ export function buildConsoleActorUrl(context, actorId) {
|
|
|
46
46
|
export function buildConsoleRunUrl(context, runId) {
|
|
47
47
|
return buildConsoleUrl(context, `/actors/runs/${runId}`);
|
|
48
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
* Builds the Console build detail URL: `<consoleBaseUrl>[/organization/<orgId>]/actors/<actorId>/builds/<buildNumber>`.
|
|
51
|
+
* Console resolves builds by number, not by ID (the CLI links the same way); a build ID in the path 404s.
|
|
52
|
+
*/
|
|
53
|
+
export function buildConsoleBuildUrl(context, actorId, buildNumber) {
|
|
54
|
+
return buildConsoleUrl(context, `/actors/${actorId}/builds/${buildNumber}`);
|
|
55
|
+
}
|
|
49
56
|
/** Builds the Console dataset URL: `<consoleBaseUrl>[/organization/<orgId>]/storage/datasets/<datasetId>`. */
|
|
50
57
|
export function buildConsoleDatasetUrl(context, datasetId) {
|
|
51
58
|
return buildConsoleUrl(context, `/storage/datasets/${datasetId}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console_link.js","sourceRoot":"","sources":["../../src/utils/console_link.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAE/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,0GAA0G;AAC1G,SAAS,iBAAiB;IACtB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,oBAAoB,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,gBAAgB,CAAC;AACvG,CAAC;AAED,6FAA6F;AAC7F,MAAM,eAAe,GAAG,WAAW,CAAC;AAEpC,8EAA8E;AAC9E,0DAA0D;AAC1D,MAAM,CAAC,MAAM,oBAAoB,GAC7B,gHAAgH,CAAC;AAErH;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACvC,UAA8B,EAC9B,WAAwB;IAExB,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAC,eAAe,CAAC,CAAA;QAAE,OAAO,SAAS,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAClE,OAAO,EAAE,cAAc,EAAE,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AACxG,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,OAAuC,EAAE,IAAY;IAC1E,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,iBAAiB,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1F,OAAO,GAAG,iBAAiB,EAAE,GAAG,SAAS,GAAG,IAAI,EAAE,CAAC;AACvD,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,oBAAoB,CAAC,OAAuC,EAAE,OAAe;IACzF,OAAO,eAAe,CAAC,OAAO,EAAE,WAAW,OAAO,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,wGAAwG;AACxG,MAAM,UAAU,kBAAkB,CAAC,OAAuC,EAAE,KAAa;IACrF,OAAO,eAAe,CAAC,OAAO,EAAE,gBAAgB,KAAK,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,8GAA8G;AAC9G,MAAM,UAAU,sBAAsB,CAAC,OAAuC,EAAE,SAAiB;IAC7F,OAAO,eAAe,CAAC,OAAO,EAAE,qBAAqB,SAAS,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,4HAA4H;AAC5H,MAAM,UAAU,4BAA4B,CACxC,OAAuC,EACvC,OAAe;IAEf,OAAO,eAAe,CAAC,OAAO,EAAE,6BAA6B,OAAO,EAAE,CAAC,CAAC;AAC5E,CAAC"}
|
|
1
|
+
{"version":3,"file":"console_link.js","sourceRoot":"","sources":["../../src/utils/console_link.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAE/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,0GAA0G;AAC1G,SAAS,iBAAiB;IACtB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,oBAAoB,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,gBAAgB,CAAC;AACvG,CAAC;AAED,6FAA6F;AAC7F,MAAM,eAAe,GAAG,WAAW,CAAC;AAEpC,8EAA8E;AAC9E,0DAA0D;AAC1D,MAAM,CAAC,MAAM,oBAAoB,GAC7B,gHAAgH,CAAC;AAErH;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACvC,UAA8B,EAC9B,WAAwB;IAExB,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAC,eAAe,CAAC,CAAA;QAAE,OAAO,SAAS,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAClE,OAAO,EAAE,cAAc,EAAE,QAAQ,CAAC,cAAc,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AACxG,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,OAAuC,EAAE,IAAY;IAC1E,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,iBAAiB,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1F,OAAO,GAAG,iBAAiB,EAAE,GAAG,SAAS,GAAG,IAAI,EAAE,CAAC;AACvD,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,oBAAoB,CAAC,OAAuC,EAAE,OAAe;IACzF,OAAO,eAAe,CAAC,OAAO,EAAE,WAAW,OAAO,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,wGAAwG;AACxG,MAAM,UAAU,kBAAkB,CAAC,OAAuC,EAAE,KAAa;IACrF,OAAO,eAAe,CAAC,OAAO,EAAE,gBAAgB,KAAK,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAChC,OAAuC,EACvC,OAAe,EACf,WAAmB;IAEnB,OAAO,eAAe,CAAC,OAAO,EAAE,WAAW,OAAO,WAAW,WAAW,EAAE,CAAC,CAAC;AAChF,CAAC;AAED,8GAA8G;AAC9G,MAAM,UAAU,sBAAsB,CAAC,OAAuC,EAAE,SAAiB;IAC7F,OAAO,eAAe,CAAC,OAAO,EAAE,qBAAqB,SAAS,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,4HAA4H;AAC5H,MAAM,UAAU,4BAA4B,CACxC,OAAuC,EACvC,OAAe;IAEf,OAAO,eAAe,CAAC,OAAO,EAAE,6BAA6B,OAAO,EAAE,CAAC,CAAC;AAC5E,CAAC"}
|
package/dist/utils/progress.d.ts
CHANGED
|
@@ -13,6 +13,10 @@ export declare function formatRunStatusMessage(actorName: string, run: {
|
|
|
13
13
|
statusMessage?: string | null;
|
|
14
14
|
isStatusMessageTerminal?: boolean | null;
|
|
15
15
|
}): string;
|
|
16
|
+
/** Leads with the status like `formatRunStatusMessage`; builds carry no status message. */
|
|
17
|
+
export declare function formatBuildStatusMessage(label: string, build: {
|
|
18
|
+
status: string;
|
|
19
|
+
}): string;
|
|
16
20
|
export declare class ProgressTracker {
|
|
17
21
|
private progressToken?;
|
|
18
22
|
private sendNotification?;
|
|
@@ -36,6 +40,15 @@ export declare class ProgressTracker {
|
|
|
36
40
|
status?: string;
|
|
37
41
|
statusMessage?: string | null;
|
|
38
42
|
}): void;
|
|
43
|
+
startActorBuildUpdates(buildId: string, apifyClient: ApifyClient, label: string, initial?: {
|
|
44
|
+
status: string;
|
|
45
|
+
}): void;
|
|
46
|
+
/**
|
|
47
|
+
* Polls `fetchStatus` every `PROGRESS_NOTIFICATION_INTERVAL_MS` and emits its message whenever it
|
|
48
|
+
* changes, stopping once the status is terminal. `initialMessage` is what the caller emitted before
|
|
49
|
+
* starting, so the first tick does not repeat it.
|
|
50
|
+
*/
|
|
51
|
+
private startStatusUpdates;
|
|
39
52
|
stop(): void;
|
|
40
53
|
}
|
|
41
54
|
export declare function createProgressTracker(progressToken: string | number | undefined, sendNotification: ((notification: ProgressNotification) => Promise<void>) | undefined, taskId?: string, onStatusMessage?: (message: string) => Promise<void>): ProgressTracker | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/utils/progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAG/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAMtD,eAAO,MAAM,iCAAiC,OAAO,CAAC;AAEtD,eAAO,MAAM,qBAAqB,aAA2D,CAAC;AAE9F;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAClC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,uBAAuB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,GACjG,MAAM,CAIR;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,aAAa,CAAC,CAAkB;IACxC,OAAO,CAAC,gBAAgB,CAAC,CAAwD;IACjF,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,kBAAkB,CAAC,CAAS;IACpC,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,eAAe,CAAC,CAAqC;IAC7D,OAAO,CAAC,KAAK,CAAC,CAAS;gBAEX,OAAO,EAAE;QACjB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAChC,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KACxD;IAOD,8EAA8E;IAC9E,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIvB,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CrD,oBAAoB,CAChB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC7D,IAAI;
|
|
1
|
+
{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/utils/progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAG/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAMtD,eAAO,MAAM,iCAAiC,OAAO,CAAC;AAEtD,eAAO,MAAM,qBAAqB,aAA2D,CAAC;AAE9F;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAClC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,uBAAuB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,GACjG,MAAM,CAIR;AAED,2FAA2F;AAC3F,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEzF;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,aAAa,CAAC,CAAkB;IACxC,OAAO,CAAC,gBAAgB,CAAC,CAAwD;IACjF,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,kBAAkB,CAAC,CAAS;IACpC,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,eAAe,CAAC,CAAqC;IAC7D,OAAO,CAAC,KAAK,CAAC,CAAS;gBAEX,OAAO,EAAE;QACjB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAChC,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KACxD;IAOD,8EAA8E;IAC9E,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIvB,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CrD,oBAAoB,CAChB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC7D,IAAI;IAcP,sBAAsB,CAClB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAC7B,IAAI;IAUP;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAoC1B,IAAI,IAAI,IAAI;CAOf;AAED,wBAAgB,qBAAqB,CACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAC1C,gBAAgB,EAAE,CAAC,CAAC,YAAY,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,EACrF,MAAM,CAAC,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GACrD,eAAe,GAAG,IAAI,CAQxB"}
|
package/dist/utils/progress.js
CHANGED
|
@@ -16,6 +16,10 @@ export function formatRunStatusMessage(actorName, run) {
|
|
|
16
16
|
const showStatusMessage = run.statusMessage && (!isTerminal || run.isStatusMessageTerminal === true);
|
|
17
17
|
return showStatusMessage ? `${actorName}: ${run.status} — ${run.statusMessage}` : `${actorName}: ${run.status}`;
|
|
18
18
|
}
|
|
19
|
+
/** Leads with the status like `formatRunStatusMessage`; builds carry no status message. */
|
|
20
|
+
export function formatBuildStatusMessage(label, build) {
|
|
21
|
+
return `${label}: ${build.status}`;
|
|
22
|
+
}
|
|
19
23
|
export class ProgressTracker {
|
|
20
24
|
constructor(options) {
|
|
21
25
|
Object.defineProperty(this, "progressToken", {
|
|
@@ -126,32 +130,47 @@ export class ProgressTracker {
|
|
|
126
130
|
}
|
|
127
131
|
startActorRunUpdates(runId, apifyClient, actorName, initial) {
|
|
128
132
|
var _a;
|
|
133
|
+
this.startStatusUpdates(async () => {
|
|
134
|
+
const run = await apifyClient.run(runId).get();
|
|
135
|
+
return run && { status: run.status, message: formatRunStatusMessage(actorName, run) };
|
|
136
|
+
}, initial &&
|
|
137
|
+
formatRunStatusMessage(actorName, {
|
|
138
|
+
status: (_a = initial.status) !== null && _a !== void 0 ? _a : '',
|
|
139
|
+
statusMessage: initial.statusMessage,
|
|
140
|
+
}));
|
|
141
|
+
}
|
|
142
|
+
startActorBuildUpdates(buildId, apifyClient, label, initial) {
|
|
143
|
+
this.startStatusUpdates(async () => {
|
|
144
|
+
const build = await apifyClient.build(buildId).get();
|
|
145
|
+
return build && { status: build.status, message: formatBuildStatusMessage(label, build) };
|
|
146
|
+
}, initial && formatBuildStatusMessage(label, initial));
|
|
147
|
+
}
|
|
148
|
+
/**
|
|
149
|
+
* Polls `fetchStatus` every `PROGRESS_NOTIFICATION_INTERVAL_MS` and emits its message whenever it
|
|
150
|
+
* changes, stopping once the status is terminal. `initialMessage` is what the caller emitted before
|
|
151
|
+
* starting, so the first tick does not repeat it.
|
|
152
|
+
*/
|
|
153
|
+
startStatusUpdates(fetchStatus, initialMessage) {
|
|
129
154
|
this.stop();
|
|
130
155
|
this.stopped = false;
|
|
131
|
-
let
|
|
132
|
-
let lastStatusMessage = (initial === null || initial === void 0 ? void 0 : initial.statusMessage) || '';
|
|
156
|
+
let lastMessage = initialMessage;
|
|
133
157
|
let tickInProgress = false;
|
|
134
158
|
this.intervalId = setInterval(async () => {
|
|
135
|
-
// Skip if a previous tick is still awaiting
|
|
159
|
+
// Skip if a previous tick is still awaiting the fetch / updateProgress() — otherwise
|
|
136
160
|
// a slow tick can overlap with the next one and cause out-of-order emissions.
|
|
137
161
|
if (tickInProgress)
|
|
138
162
|
return;
|
|
139
163
|
tickInProgress = true;
|
|
140
164
|
try {
|
|
141
|
-
const
|
|
142
|
-
// stop() may have been called while
|
|
165
|
+
const current = await fetchStatus();
|
|
166
|
+
// stop() may have been called while the fetch was awaiting; clearInterval can't
|
|
143
167
|
// abort an in-flight tick, so guard here to avoid a late duplicate emission.
|
|
144
|
-
if (this.stopped || !
|
|
168
|
+
if (this.stopped || !current)
|
|
145
169
|
return;
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
lastStatus = status;
|
|
151
|
-
lastStatusMessage = normalizedStatusMessage;
|
|
152
|
-
await this.updateProgress(formatRunStatusMessage(actorName, run));
|
|
153
|
-
// Stop polling if Actor finished
|
|
154
|
-
if (TERMINAL_RUN_STATUSES.has(status)) {
|
|
170
|
+
if (current.message !== lastMessage) {
|
|
171
|
+
lastMessage = current.message;
|
|
172
|
+
await this.updateProgress(current.message);
|
|
173
|
+
if (TERMINAL_RUN_STATUSES.has(current.status)) {
|
|
155
174
|
this.stop();
|
|
156
175
|
}
|
|
157
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/utils/progress.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/utils/progress.ts"],"names":[],"mappings":"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"}
|