modal 0.7.1 → 0.7.2

package/README.md

@@ -40,6 +40,7 @@ We also provide a number of examples:
 - [Create a Sandbox with GPU](https://github.com/modal-labs/libmodal/blob/main/modal-js/examples/sandbox-gpu.ts)
 - [Create a Sandbox using a private image from AWS ECR](https://github.com/modal-labs/libmodal/blob/main/modal-js/examples/sandbox-private-image.ts)
 - [Take a snapshot of the filesystem of a Sandbox](https://github.com/modal-labs/libmodal/blob/main/modal-js/examples/sandbox-filesystem-snapshot.ts)
+- [Snapshot a directory, and mount it in a running Sandbox](https://github.com/modal-labs/libmodal/blob/main/modal-js/examples/sandbox-directory-snapshot.ts)
 - [Execute Sandbox commands](https://github.com/modal-labs/libmodal/blob/main/modal-js/examples/sandbox-exec.ts)
 - [Running a coding agent in a Sandbox](https://github.com/modal-labs/libmodal/blob/main/modal-js/examples/sandbox-agent.ts)
 - [Check the status and exit code of a Sandbox](https://github.com/modal-labs/libmodal/blob/main/modal-js/examples/sandbox-poll.ts)

package/dist/index.cjs

@@ -48940,24 +48940,33 @@ var Sandbox2 = class _Sandbox {
       throw new ClientClosedError();
     }
   }
+  static #maxGetTaskIdAttempts = 600;
+  // 5 minutes at 500ms intervals
   async #getTaskId() {
-    if (this.#taskId === void 0) {
+    if (this.#taskId !== void 0) {
+      return this.#taskId;
+    }
+    for (let i = 0; i < _Sandbox.#maxGetTaskIdAttempts; i++) {
       const resp = await this.#client.cpClient.sandboxGetTaskId({
         sandboxId: this.sandboxId
       });
-      if (!resp.taskId) {
-        throw new Error(
-          `Sandbox ${this.sandboxId} does not have a task ID. It may not be running.`
-        );
-      }
       if (resp.taskResult) {
+        if (resp.taskResult.status === 1 /* GENERIC_STATUS_SUCCESS */ || !resp.taskResult.exception) {
+          throw new Error(`Sandbox ${this.sandboxId} has already completed`);
+        }
         throw new Error(
-          `Sandbox ${this.sandboxId} has already completed with result: ${resp.taskResult}`
+          `Sandbox ${this.sandboxId} has already completed with result: exception:"${resp.taskResult.exception}"`
         );
       }
-      this.#taskId = resp.taskId;
+      if (resp.taskId) {
+        this.#taskId = resp.taskId;
+        return this.#taskId;
+      }
+      await (0, import_promises2.setTimeout)(500);
     }
-    return this.#taskId;
+    throw new Error(
+      `Timed out waiting for task ID for Sandbox ${this.sandboxId}`
+    );
   }
   async #getOrCreateCommandRouterClient(taskId) {
     if (this.#commandRouterClient !== void 0) {
@@ -49270,6 +49279,9 @@ async function* outputStreamSb(cpClient, sandboxId, fileDescriptor, signal) {
           completed = true;
           break;
         }
+        if (signal?.aborted) {
+          return;
+        }
       }
     } catch (err) {
       if (signal?.aborted) {
@@ -49480,28 +49492,47 @@ var AuthTokenManager = class {
   logger;
   currentToken = "";
   tokenExpiry = 0;
-  timeoutId = null;
-  running = false;
-  fetchPromise = null;
+  refreshPromise = null;
   constructor(client2, logger) {
     this.client = client2;
     this.logger = logger;
   }
   /**
    * Returns a valid auth token.
-   * If the current token is expired and the manager is running, triggers an on-demand refresh.
    */
   async getToken() {
-    if (this.currentToken && !this.isExpired()) {
-      return this.currentToken;
+    if (!this.currentToken || this.isExpired()) {
+      return this.lockedRefreshToken();
     }
-    if (this.running) {
-      await this.runFetch();
-      if (this.currentToken && !this.isExpired()) {
-        return this.currentToken;
+    if (this.needsRefresh() && !this.refreshPromise) {
+      try {
+        await this.lockedRefreshToken();
+      } catch (error) {
+        this.logger.error("refreshing auth token", "error", error);
       }
     }
-    throw new Error("No valid auth token available");
+    return this.currentToken;
+  }
+  /**
+   * Ensures only one fetch is in progress at a time. Concurrent callers
+   * await the same promise. Includes a double-check so that if another
+   * caller already refreshed, we skip the RPC.
+   */
+  async lockedRefreshToken() {
+    if (!this.refreshPromise) {
+      this.refreshPromise = (async () => {
+        try {
+          if (this.currentToken && !this.needsRefresh()) {
+            return;
+          }
+          await this.fetchToken();
+        } finally {
+          this.refreshPromise = null;
+        }
+      })();
+    }
+    await this.refreshPromise;
+    return this.currentToken;
   }
   /**
    * Fetches a new auth token from the server and stores it.
@@ -49533,56 +49564,6 @@ var AuthTokenManager = class {
       `${refreshIn}s`
     );
   }
-  /**
-   * Background loop that refreshes tokens REFRESH_WINDOW seconds before they expire.
-   */
-  async backgroundRefresh() {
-    while (this.running) {
-      const now = Math.floor(Date.now() / 1e3);
-      const refreshTime = this.tokenExpiry - REFRESH_WINDOW;
-      const delay = Math.max(0, refreshTime - now) * 1e3;
-      await new Promise((resolve) => {
-        this.timeoutId = setTimeout(resolve, delay);
-        this.timeoutId.unref();
-      });
-      if (!this.running) {
-        return;
-      }
-      try {
-        await this.runFetch();
-      } catch (error) {
-        this.logger.error("Failed to refresh auth token", "error", error);
-        await new Promise((resolve) => setTimeout(resolve, 5e3));
-      }
-    }
-  }
-  /**
-   * Fetches the initial token and starts the refresh loop.
-   * Throws an error if the initial token fetch fails.
-   */
-  async start() {
-    if (this.running) {
-      return;
-    }
-    this.running = true;
-    try {
-      await this.runFetch();
-    } catch (error) {
-      this.running = false;
-      throw error;
-    }
-    this.backgroundRefresh();
-  }
-  /**
-   * Stops the background refresh.
-   */
-  stop() {
-    this.running = false;
-    if (this.timeoutId) {
-      clearTimeout(this.timeoutId);
-      this.timeoutId = null;
-    }
-  }
   /**
    * Extracts the exp claim from a JWT token.
    */
@@ -49607,17 +49588,9 @@ var AuthTokenManager = class {
     const now = Math.floor(Date.now() / 1e3);
     return now >= this.tokenExpiry;
   }
-  runFetch() {
-    if (!this.fetchPromise) {
-      this.fetchPromise = (async () => {
-        try {
-          await this.fetchToken();
-        } finally {
-          this.fetchPromise = null;
-        }
-      })();
-    }
-    return this.fetchPromise;
+  needsRefresh() {
+    const now = Math.floor(Date.now() / 1e3);
+    return now >= this.tokenExpiry - REFRESH_WINDOW;
   }
   getCurrentToken() {
     return this.currentToken;
@@ -49630,7 +49603,7 @@ var AuthTokenManager = class {
 
 // src/version.ts
 function getSDKVersion() {
-  return true ? "0.7.1" : "0.0.0";
+  return true ? "0.7.2" : "0.0.0";
 }
 
 // src/logger.ts
@@ -49813,10 +49786,7 @@ var ModalClient2 = class {
   }
   close() {
     this.logger.debug("Closing Modal client");
-    if (this.authTokenManager) {
-      this.authTokenManager.stop();
-      this.authTokenManager = null;
-    }
+    this.authTokenManager = null;
     this.logger.debug("Modal client closed");
   }
   version() {
@@ -49926,7 +49896,6 @@ var ModalClient2 = class {
           this.cpClient,
           this.logger
         );
-        this.authTokenManager.start();
       }
       return this.authTokenManager;
     };

package/dist/index.js

@@ -48878,24 +48878,33 @@ var Sandbox2 = class _Sandbox {
       throw new ClientClosedError();
     }
   }
+  static #maxGetTaskIdAttempts = 600;
+  // 5 minutes at 500ms intervals
   async #getTaskId() {
-    if (this.#taskId === void 0) {
+    if (this.#taskId !== void 0) {
+      return this.#taskId;
+    }
+    for (let i = 0; i < _Sandbox.#maxGetTaskIdAttempts; i++) {
       const resp = await this.#client.cpClient.sandboxGetTaskId({
         sandboxId: this.sandboxId
       });
-      if (!resp.taskId) {
-        throw new Error(
-          `Sandbox ${this.sandboxId} does not have a task ID. It may not be running.`
-        );
-      }
       if (resp.taskResult) {
+        if (resp.taskResult.status === 1 /* GENERIC_STATUS_SUCCESS */ || !resp.taskResult.exception) {
+          throw new Error(`Sandbox ${this.sandboxId} has already completed`);
+        }
         throw new Error(
-          `Sandbox ${this.sandboxId} has already completed with result: ${resp.taskResult}`
+          `Sandbox ${this.sandboxId} has already completed with result: exception:"${resp.taskResult.exception}"`
         );
       }
-      this.#taskId = resp.taskId;
+      if (resp.taskId) {
+        this.#taskId = resp.taskId;
+        return this.#taskId;
+      }
+      await setTimeout3(500);
     }
-    return this.#taskId;
+    throw new Error(
+      `Timed out waiting for task ID for Sandbox ${this.sandboxId}`
+    );
   }
   async #getOrCreateCommandRouterClient(taskId) {
     if (this.#commandRouterClient !== void 0) {
@@ -49208,6 +49217,9 @@ async function* outputStreamSb(cpClient, sandboxId, fileDescriptor, signal) {
           completed = true;
           break;
         }
+        if (signal?.aborted) {
+          return;
+        }
       }
     } catch (err) {
       if (signal?.aborted) {
@@ -49418,28 +49430,47 @@ var AuthTokenManager = class {
   logger;
   currentToken = "";
   tokenExpiry = 0;
-  timeoutId = null;
-  running = false;
-  fetchPromise = null;
+  refreshPromise = null;
   constructor(client2, logger) {
     this.client = client2;
     this.logger = logger;
   }
   /**
    * Returns a valid auth token.
-   * If the current token is expired and the manager is running, triggers an on-demand refresh.
    */
   async getToken() {
-    if (this.currentToken && !this.isExpired()) {
-      return this.currentToken;
+    if (!this.currentToken || this.isExpired()) {
+      return this.lockedRefreshToken();
     }
-    if (this.running) {
-      await this.runFetch();
-      if (this.currentToken && !this.isExpired()) {
-        return this.currentToken;
+    if (this.needsRefresh() && !this.refreshPromise) {
+      try {
+        await this.lockedRefreshToken();
+      } catch (error) {
+        this.logger.error("refreshing auth token", "error", error);
       }
     }
-    throw new Error("No valid auth token available");
+    return this.currentToken;
+  }
+  /**
+   * Ensures only one fetch is in progress at a time. Concurrent callers
+   * await the same promise. Includes a double-check so that if another
+   * caller already refreshed, we skip the RPC.
+   */
+  async lockedRefreshToken() {
+    if (!this.refreshPromise) {
+      this.refreshPromise = (async () => {
+        try {
+          if (this.currentToken && !this.needsRefresh()) {
+            return;
+          }
+          await this.fetchToken();
+        } finally {
+          this.refreshPromise = null;
+        }
+      })();
+    }
+    await this.refreshPromise;
+    return this.currentToken;
   }
   /**
    * Fetches a new auth token from the server and stores it.
@@ -49471,56 +49502,6 @@ var AuthTokenManager = class {
       `${refreshIn}s`
     );
   }
-  /**
-   * Background loop that refreshes tokens REFRESH_WINDOW seconds before they expire.
-   */
-  async backgroundRefresh() {
-    while (this.running) {
-      const now = Math.floor(Date.now() / 1e3);
-      const refreshTime = this.tokenExpiry - REFRESH_WINDOW;
-      const delay = Math.max(0, refreshTime - now) * 1e3;
-      await new Promise((resolve) => {
-        this.timeoutId = setTimeout(resolve, delay);
-        this.timeoutId.unref();
-      });
-      if (!this.running) {
-        return;
-      }
-      try {
-        await this.runFetch();
-      } catch (error) {
-        this.logger.error("Failed to refresh auth token", "error", error);
-        await new Promise((resolve) => setTimeout(resolve, 5e3));
-      }
-    }
-  }
-  /**
-   * Fetches the initial token and starts the refresh loop.
-   * Throws an error if the initial token fetch fails.
-   */
-  async start() {
-    if (this.running) {
-      return;
-    }
-    this.running = true;
-    try {
-      await this.runFetch();
-    } catch (error) {
-      this.running = false;
-      throw error;
-    }
-    this.backgroundRefresh();
-  }
-  /**
-   * Stops the background refresh.
-   */
-  stop() {
-    this.running = false;
-    if (this.timeoutId) {
-      clearTimeout(this.timeoutId);
-      this.timeoutId = null;
-    }
-  }
   /**
    * Extracts the exp claim from a JWT token.
    */
@@ -49545,17 +49526,9 @@ var AuthTokenManager = class {
     const now = Math.floor(Date.now() / 1e3);
     return now >= this.tokenExpiry;
   }
-  runFetch() {
-    if (!this.fetchPromise) {
-      this.fetchPromise = (async () => {
-        try {
-          await this.fetchToken();
-        } finally {
-          this.fetchPromise = null;
-        }
-      })();
-    }
-    return this.fetchPromise;
+  needsRefresh() {
+    const now = Math.floor(Date.now() / 1e3);
+    return now >= this.tokenExpiry - REFRESH_WINDOW;
   }
   getCurrentToken() {
     return this.currentToken;
@@ -49568,7 +49541,7 @@ var AuthTokenManager = class {
 
 // src/version.ts
 function getSDKVersion() {
-  return true ? "0.7.1" : "0.0.0";
+  return true ? "0.7.2" : "0.0.0";
 }
 
 // src/logger.ts
@@ -49751,10 +49724,7 @@ var ModalClient2 = class {
   }
   close() {
     this.logger.debug("Closing Modal client");
-    if (this.authTokenManager) {
-      this.authTokenManager.stop();
-      this.authTokenManager = null;
-    }
+    this.authTokenManager = null;
     this.logger.debug("Modal client closed");
   }
   version() {
@@ -49864,7 +49834,6 @@ var ModalClient2 = class {
           this.cpClient,
           this.logger
         );
-        this.authTokenManager.start();
       }
       return this.authTokenManager;
     };

package/package.json

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