modal 0.6.1 → 0.6.2

package/dist/index.cjs

@@ -46484,6 +46484,7 @@ var Queue = class _Queue {
 
 // src/sandbox.ts
 var import_nice_grpc8 = require("nice-grpc");
+var import_promises = require("timers/promises");
 
 // src/sandbox_filesystem.ts
 var SandboxFile = class {
@@ -46667,7 +46668,7 @@ var writeMixin = {
     }
   }
 };
-function streamConsumingIter(iterable) {
+function streamConsumingIter(iterable, onCancel) {
   const iter = iterable[Symbol.asyncIterator]();
   return new ReadableStream(
     {
@@ -46681,7 +46682,13 @@ function streamConsumingIter(iterable) {
         }
       },
       async cancel() {
-        consumeIterator(iter);
+        try {
+          onCancel?.();
+        } finally {
+          if (typeof iter.return === "function") {
+            await iter.return();
+          }
+        }
       }
     },
     new ByteLengthQueuingStrategy({
@@ -46690,14 +46697,11 @@ function streamConsumingIter(iterable) {
     })
   );
 }
-async function consumeIterator(iter) {
-  while (true) {
-    const { done } = await iter.next();
-    if (done) break;
-  }
-}
 
 // src/sandbox.ts
+var SB_LOGS_INITIAL_DELAY_MS = 10;
+var SB_LOGS_DELAY_FACTOR = 2;
+var SB_LOGS_MAX_RETRIES = 10;
 async function buildSandboxCreateRequestProto(appId, imageId, params = {}) {
   checkForRenamedParams(params, {
     memory: "memoryMiB",
@@ -47073,34 +47077,61 @@ async function buildContainerExecRequestProto(taskId, command, params) {
 var Sandbox2 = class _Sandbox {
   #client;
   sandboxId;
-  stdin;
-  stdout;
-  stderr;
+  #stdin;
+  #stdout;
+  #stderr;
+  #stdoutAbort;
+  #stderrAbort;
   #taskId;
   #tunnels;
   /** @ignore */
   constructor(client2, sandboxId) {
     this.#client = client2;
     this.sandboxId = sandboxId;
-    this.stdin = toModalWriteStream(inputStreamSb(client2.cpClient, sandboxId));
-    this.stdout = toModalReadStream(
-      streamConsumingIter(
+  }
+  get stdin() {
+    if (!this.#stdin) {
+      this.#stdin = toModalWriteStream(
+        inputStreamSb(this.#client.cpClient, this.sandboxId)
+      );
+    }
+    return this.#stdin;
+  }
+  get stdout() {
+    if (!this.#stdout) {
+      this.#stdoutAbort = new AbortController();
+      const bytesStream = streamConsumingIter(
         outputStreamSb(
-          client2.cpClient,
-          sandboxId,
-          1 /* FILE_DESCRIPTOR_STDOUT */
-        )
-      ).pipeThrough(new TextDecoderStream())
-    );
-    this.stderr = toModalReadStream(
-      streamConsumingIter(
+          this.#client.cpClient,
+          this.sandboxId,
+          1 /* FILE_DESCRIPTOR_STDOUT */,
+          this.#stdoutAbort.signal
+        ),
+        () => this.#stdoutAbort?.abort()
+      );
+      this.#stdout = toModalReadStream(
+        bytesStream.pipeThrough(new TextDecoderStream())
+      );
+    }
+    return this.#stdout;
+  }
+  get stderr() {
+    if (!this.#stderr) {
+      this.#stderrAbort = new AbortController();
+      const bytesStream = streamConsumingIter(
         outputStreamSb(
-          client2.cpClient,
-          sandboxId,
-          2 /* FILE_DESCRIPTOR_STDERR */
-        )
-      ).pipeThrough(new TextDecoderStream())
-    );
+          this.#client.cpClient,
+          this.sandboxId,
+          2 /* FILE_DESCRIPTOR_STDERR */,
+          this.#stderrAbort.signal
+        ),
+        () => this.#stderrAbort?.abort()
+      );
+      this.#stderr = toModalReadStream(
+        bytesStream.pipeThrough(new TextDecoderStream())
+      );
+    }
+    return this.#stderr;
   }
   /** Set tags (key-value pairs) on the Sandbox. Tags can be used to filter results in {@link SandboxService#list Sandbox.list}. */
   async setTags(tags) {
@@ -47399,19 +47430,25 @@ var ContainerProcess = class {
     }
   }
 };
-async function* outputStreamSb(cpClient, sandboxId, fileDescriptor) {
+async function* outputStreamSb(cpClient, sandboxId, fileDescriptor, signal) {
   let lastIndex = "0-0";
   let completed = false;
-  let retries = 10;
+  let retriesRemaining = SB_LOGS_MAX_RETRIES;
+  let delayMs = SB_LOGS_INITIAL_DELAY_MS;
   while (!completed) {
     try {
-      const outputIterator = cpClient.sandboxGetLogs({
-        sandboxId,
-        fileDescriptor,
-        timeout: 55,
-        lastEntryId: lastIndex
-      });
+      const outputIterator = cpClient.sandboxGetLogs(
+        {
+          sandboxId,
+          fileDescriptor,
+          timeout: 55,
+          lastEntryId: lastIndex
+        },
+        { signal }
+      );
       for await (const batch of outputIterator) {
+        delayMs = SB_LOGS_INITIAL_DELAY_MS;
+        retriesRemaining = SB_LOGS_MAX_RETRIES;
         lastIndex = batch.entryId;
         yield* batch.items.map((item) => new TextEncoder().encode(item.data));
         if (batch.eof) {
@@ -47420,8 +47457,21 @@ async function* outputStreamSb(cpClient, sandboxId, fileDescriptor) {
         }
       }
     } catch (err) {
-      if (isRetryableGrpc(err) && retries > 0) retries--;
-      else throw err;
+      if (signal?.aborted) {
+        return;
+      }
+      if (isRetryableGrpc(err) && retriesRemaining > 0) {
+        try {
+          await (0, import_promises.setTimeout)(delayMs, void 0, { signal });
+        } catch {
+          return;
+        }
+        delayMs *= SB_LOGS_DELAY_FACTOR;
+        retriesRemaining--;
+        continue;
+      } else {
+        throw err;
+      }
     }
   }
 }
@@ -47826,7 +47876,7 @@ var AuthTokenManager = class {
 
 // src/version.ts
 function getSDKVersion() {
-  return true ? "0.6.1" : "0.0.0";
+  return true ? "0.6.2" : "0.0.0";
 }
 
 // src/logger.ts

package/dist/index.d.cts

@@ -5937,11 +5937,11 @@ declare class Tunnel {
 declare class Sandbox {
     #private;
     readonly sandboxId: string;
-    stdin: ModalWriteStream<string>;
-    stdout: ModalReadStream<string>;
-    stderr: ModalReadStream<string>;
     /** @ignore */
     constructor(client: ModalClient, sandboxId: string);
+    get stdin(): ModalWriteStream<string>;
+    get stdout(): ModalReadStream<string>;
+    get stderr(): ModalReadStream<string>;
     /** Set tags (key-value pairs) on the Sandbox. Tags can be used to filter results in {@link SandboxService#list Sandbox.list}. */
     setTags(tags: Record<string, string>): Promise<void>;
     /** Get tags (key-value pairs) currently attached to this Sandbox from the server. */

package/dist/index.d.ts

@@ -5937,11 +5937,11 @@ declare class Tunnel {
 declare class Sandbox {
     #private;
     readonly sandboxId: string;
-    stdin: ModalWriteStream<string>;
-    stdout: ModalReadStream<string>;
-    stderr: ModalReadStream<string>;
     /** @ignore */
     constructor(client: ModalClient, sandboxId: string);
+    get stdin(): ModalWriteStream<string>;
+    get stdout(): ModalReadStream<string>;
+    get stderr(): ModalReadStream<string>;
     /** Set tags (key-value pairs) on the Sandbox. Tags can be used to filter results in {@link SandboxService#list Sandbox.list}. */
     setTags(tags: Record<string, string>): Promise<void>;
     /** Get tags (key-value pairs) currently attached to this Sandbox from the server. */

package/dist/index.js

@@ -46416,6 +46416,7 @@ var Queue = class _Queue {
 
 // src/sandbox.ts
 import { ClientError as ClientError7, Status as Status7 } from "nice-grpc";
+import { setTimeout as setTimeout2 } from "timers/promises";
 
 // src/sandbox_filesystem.ts
 var SandboxFile = class {
@@ -46599,7 +46600,7 @@ var writeMixin = {
     }
   }
 };
-function streamConsumingIter(iterable) {
+function streamConsumingIter(iterable, onCancel) {
   const iter = iterable[Symbol.asyncIterator]();
   return new ReadableStream(
     {
@@ -46613,7 +46614,13 @@ function streamConsumingIter(iterable) {
         }
       },
       async cancel() {
-        consumeIterator(iter);
+        try {
+          onCancel?.();
+        } finally {
+          if (typeof iter.return === "function") {
+            await iter.return();
+          }
+        }
       }
     },
     new ByteLengthQueuingStrategy({
@@ -46622,14 +46629,11 @@ function streamConsumingIter(iterable) {
     })
   );
 }
-async function consumeIterator(iter) {
-  while (true) {
-    const { done } = await iter.next();
-    if (done) break;
-  }
-}
 
 // src/sandbox.ts
+var SB_LOGS_INITIAL_DELAY_MS = 10;
+var SB_LOGS_DELAY_FACTOR = 2;
+var SB_LOGS_MAX_RETRIES = 10;
 async function buildSandboxCreateRequestProto(appId, imageId, params = {}) {
   checkForRenamedParams(params, {
     memory: "memoryMiB",
@@ -47005,34 +47009,61 @@ async function buildContainerExecRequestProto(taskId, command, params) {
 var Sandbox2 = class _Sandbox {
   #client;
   sandboxId;
-  stdin;
-  stdout;
-  stderr;
+  #stdin;
+  #stdout;
+  #stderr;
+  #stdoutAbort;
+  #stderrAbort;
   #taskId;
   #tunnels;
   /** @ignore */
   constructor(client2, sandboxId) {
     this.#client = client2;
     this.sandboxId = sandboxId;
-    this.stdin = toModalWriteStream(inputStreamSb(client2.cpClient, sandboxId));
-    this.stdout = toModalReadStream(
-      streamConsumingIter(
+  }
+  get stdin() {
+    if (!this.#stdin) {
+      this.#stdin = toModalWriteStream(
+        inputStreamSb(this.#client.cpClient, this.sandboxId)
+      );
+    }
+    return this.#stdin;
+  }
+  get stdout() {
+    if (!this.#stdout) {
+      this.#stdoutAbort = new AbortController();
+      const bytesStream = streamConsumingIter(
         outputStreamSb(
-          client2.cpClient,
-          sandboxId,
-          1 /* FILE_DESCRIPTOR_STDOUT */
-        )
-      ).pipeThrough(new TextDecoderStream())
-    );
-    this.stderr = toModalReadStream(
-      streamConsumingIter(
+          this.#client.cpClient,
+          this.sandboxId,
+          1 /* FILE_DESCRIPTOR_STDOUT */,
+          this.#stdoutAbort.signal
+        ),
+        () => this.#stdoutAbort?.abort()
+      );
+      this.#stdout = toModalReadStream(
+        bytesStream.pipeThrough(new TextDecoderStream())
+      );
+    }
+    return this.#stdout;
+  }
+  get stderr() {
+    if (!this.#stderr) {
+      this.#stderrAbort = new AbortController();
+      const bytesStream = streamConsumingIter(
         outputStreamSb(
-          client2.cpClient,
-          sandboxId,
-          2 /* FILE_DESCRIPTOR_STDERR */
-        )
-      ).pipeThrough(new TextDecoderStream())
-    );
+          this.#client.cpClient,
+          this.sandboxId,
+          2 /* FILE_DESCRIPTOR_STDERR */,
+          this.#stderrAbort.signal
+        ),
+        () => this.#stderrAbort?.abort()
+      );
+      this.#stderr = toModalReadStream(
+        bytesStream.pipeThrough(new TextDecoderStream())
+      );
+    }
+    return this.#stderr;
   }
   /** Set tags (key-value pairs) on the Sandbox. Tags can be used to filter results in {@link SandboxService#list Sandbox.list}. */
   async setTags(tags) {
@@ -47331,19 +47362,25 @@ var ContainerProcess = class {
     }
   }
 };
-async function* outputStreamSb(cpClient, sandboxId, fileDescriptor) {
+async function* outputStreamSb(cpClient, sandboxId, fileDescriptor, signal) {
   let lastIndex = "0-0";
   let completed = false;
-  let retries = 10;
+  let retriesRemaining = SB_LOGS_MAX_RETRIES;
+  let delayMs = SB_LOGS_INITIAL_DELAY_MS;
   while (!completed) {
     try {
-      const outputIterator = cpClient.sandboxGetLogs({
-        sandboxId,
-        fileDescriptor,
-        timeout: 55,
-        lastEntryId: lastIndex
-      });
+      const outputIterator = cpClient.sandboxGetLogs(
+        {
+          sandboxId,
+          fileDescriptor,
+          timeout: 55,
+          lastEntryId: lastIndex
+        },
+        { signal }
+      );
       for await (const batch of outputIterator) {
+        delayMs = SB_LOGS_INITIAL_DELAY_MS;
+        retriesRemaining = SB_LOGS_MAX_RETRIES;
         lastIndex = batch.entryId;
         yield* batch.items.map((item) => new TextEncoder().encode(item.data));
         if (batch.eof) {
@@ -47352,8 +47389,21 @@ async function* outputStreamSb(cpClient, sandboxId, fileDescriptor) {
         }
       }
     } catch (err) {
-      if (isRetryableGrpc(err) && retries > 0) retries--;
-      else throw err;
+      if (signal?.aborted) {
+        return;
+      }
+      if (isRetryableGrpc(err) && retriesRemaining > 0) {
+        try {
+          await setTimeout2(delayMs, void 0, { signal });
+        } catch {
+          return;
+        }
+        delayMs *= SB_LOGS_DELAY_FACTOR;
+        retriesRemaining--;
+        continue;
+      } else {
+        throw err;
+      }
     }
   }
 }
@@ -47758,7 +47808,7 @@ var AuthTokenManager = class {
 
 // src/version.ts
 function getSDKVersion() {
-  return true ? "0.6.1" : "0.0.0";
+  return true ? "0.6.2" : "0.0.0";
 }
 
 // src/logger.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modal",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Modal SDK for JavaScript/TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://modal.com/docs/guide/sdk-javascript-go",