apify-client 3.0.0-beta.50 → 3.0.0-beta.51

package/dist/resource_clients/log.d.ts

@@ -81,7 +81,7 @@ export declare class StreamedLog {
      */
     start(): void;
     /**
-     * Stop log redirection.
+     * Stop log redirection. Waits up to one second for lines already in flight, then aborts the log stream request.
      */
     stop(): Promise<void>;
 }

package/dist/resource_clients/log.js

@@ -5,6 +5,8 @@ import { ResourceClient } from '../base/resource_client.js';
 import { timeoutOptionsShape } from '../timeouts.js';
 import { cast, catchNotFoundForResourceOrThrow, concatBytes, parseArgument } from '../utils.js';
 const logOptionsSchema = z.strictObject({ raw: z.boolean().optional(), ...timeoutOptionsShape });
+/** How long `StreamedLog.stop()` waits for lines already in flight before aborting the log stream request. */
+const STOP_GRACE_MILLIS = 1000;
 /**
  * Client for accessing Actor run or build logs.
  *
@@ -141,6 +143,7 @@ export class StreamedLog {
     #signal;
     #streamingTask = null;
     #stopLogging = false;
+    #stopController = new AbortController();
     constructor(options) {
         const { toLog, logClient, fromStart = true, signal } = options;
         this.#destinationLog = toLog;
@@ -156,16 +159,19 @@ export class StreamedLog {
             throw new Error('Streaming task already active');
         }
         this.#stopLogging = false;
+        this.#stopController = new AbortController();
         this.#streamingTask = this.#streamLog();
     }
     /**
-     * Stop log redirection.
+     * Stop log redirection. Waits up to one second for lines already in flight, then aborts the log stream request.
      */
     async stop() {
         if (!this.#streamingTask) {
             throw new Error('Streaming task is not active');
         }
         this.#stopLogging = true;
+        const stopController = this.#stopController;
+        const abortTimeout = setTimeout(() => stopController.abort(), STOP_GRACE_MILLIS);
         try {
             await this.#streamingTask;
         }
@@ -175,6 +181,7 @@ export class StreamedLog {
             }
         }
         finally {
+            clearTimeout(abortTimeout);
             this.#streamingTask = null;
         }
     }
@@ -182,12 +189,15 @@ export class StreamedLog {
      * Get log stream from response and redirect it to another log.
      */
     async #streamLog() {
+        const signal = this.#signal
+            ? AbortSignal.any([this.#signal, this.#stopController.signal])
+            : this.#stopController.signal;
         try {
-            const logStream = await this.#logClient.stream({ raw: true, signal: this.#signal });
+            const logStream = await this.#logClient.stream({ raw: true, signal });
             if (!logStream) {
                 return;
             }
-            const lastChunkRemainder = await this.#logStreamChunks(logStream);
+            const lastChunkRemainder = await this.#logStreamChunks(logStream, signal);
             // Process whatever is left when exiting. Maybe it is incomplete, maybe it is last log without EOL.
             const lastMessage = this.#decoder.decode(lastChunkRemainder).trim();
             if (lastMessage.length) {
@@ -195,30 +205,37 @@ export class StreamedLog {
             }
         }
         catch (err) {
-            if (this.#signal?.aborted)
+            if (signal.aborted)
                 return;
             log.warning(`Log redirection stopped due to error`, err);
         }
     }
-    async #logStreamChunks(logStream) {
+    async #logStreamChunks(logStream, signal) {
         // Chunk may be incomplete. Keep remainder for next chunk.
         let previousChunkRemainder = new Uint8Array();
-        for await (const chunk of logStream) {
-            // Handle possible leftover incomplete line from previous chunk.
-            // Everything before last end of line is complete.
-            const chunkWithPreviousRemainder = new Uint8Array(previousChunkRemainder.length + chunk.length);
-            chunkWithPreviousRemainder.set(previousChunkRemainder, 0);
-            chunkWithPreviousRemainder.set(chunk, previousChunkRemainder.length);
-            const lastCompleteMessageIndex = chunkWithPreviousRemainder.lastIndexOf(0x0a);
-            previousChunkRemainder = chunkWithPreviousRemainder.slice(lastCompleteMessageIndex);
-            // Push complete part of the chunk to the buffer
-            this.#streamBuffer.push(chunkWithPreviousRemainder.slice(0, lastCompleteMessageIndex));
-            this.#logBufferContent();
-            // Keep processing the new data until stopped
-            if (this.#stopLogging) {
-                break;
+        try {
+            for await (const chunk of logStream) {
+                // Handle possible leftover incomplete line from previous chunk.
+                // Everything before last end of line is complete.
+                const chunkWithPreviousRemainder = new Uint8Array(previousChunkRemainder.length + chunk.length);
+                chunkWithPreviousRemainder.set(previousChunkRemainder, 0);
+                chunkWithPreviousRemainder.set(chunk, previousChunkRemainder.length);
+                const lastCompleteMessageIndex = chunkWithPreviousRemainder.lastIndexOf(0x0a);
+                previousChunkRemainder = chunkWithPreviousRemainder.slice(lastCompleteMessageIndex);
+                // Push complete part of the chunk to the buffer
+                this.#streamBuffer.push(chunkWithPreviousRemainder.slice(0, lastCompleteMessageIndex));
+                this.#logBufferContent();
+                // Keep processing the new data until stopped
+                if (this.#stopLogging) {
+                    break;
+                }
             }
         }
+        catch (err) {
+            // An aborted stream still hands back its unterminated last line, so the caller can flush it.
+            if (!signal.aborted)
+                throw err;
+        }
         return previousChunkRemainder;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify-client",
-  "version": "3.0.0-beta.50",
+  "version": "3.0.0-beta.51",
   "description": "Apify API client for JavaScript",
   "engines": {
     "node": ">=22.13.0"