@fastgpt-sdk/sandbox-adapter 0.0.39 → 0.0.40-beta.1

package/dist/adapters/OpenSandboxAdapter/index.d.ts

@@ -74,6 +74,8 @@ export declare class OpenSandboxAdapter extends BaseSandboxAdapter {
     private parseResourceLimits;
     private extractExitCode;
     private getSandboxBySessionId;
+    private waitUntilSessionDeleted;
+    private killSandboxById;
     ensureRunning(): Promise<void>;
     create(): Promise<void>;
     connect(sandboxId: string): Promise<void>;

package/dist/adapters/SealosDevboxAdapter/index.d.ts

@@ -36,6 +36,7 @@ export declare class SealosDevboxAdapter extends BaseSandboxAdapter {
     private StatusAdapt;
     private buildCreateRequest;
     private removeUndefined;
+    private assertMutationSuccess;
     getInfo(): Promise<SandboxInfo | null>;
     ensureRunning(): Promise<void>;
     create(): Promise<void>;

package/dist/index.cjs

@@ -17393,7 +17393,7 @@ var require_fetch = __commonJS((exports2, module2) => {
       request.cache = "no-store";
     }
     const newConnection = forceNewConnection ? "yes" : "no";
-    if (request.mode === "websocket") {} else {}
+    if (request.mode === "websocket") {}
     let requestBody = null;
     if (request.body == null && fetchParams.processRequestEndOfBody) {
       queueMicrotask(() => fetchParams.processRequestEndOfBody());
@@ -45788,8 +45788,12 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
       case "Pending" /* Pending */:
         return "Creating";
       case "Paused" /* Paused */:
+      case "Stopped" /* Stopped */:
+      case "Shutdown" /* Shutdown */:
         return "Stopped";
       case "Pausing" /* Pausing */:
+      case "Stopping" /* Stopping */:
+      case "Shutting" /* Shutting */:
         return "Stopping";
       default:
         return "Error";
@@ -45815,6 +45819,12 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
   removeUndefined(obj) {
     return Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== undefined));
   }
+  assertMutationSuccess(res, action, okCodes = []) {
+    if (res.code >= 200 && res.code < 300 || okCodes.includes(res.code)) {
+      return;
+    }
+    throw new Error(res.message || `Devbox ${action} failed with code ${res.code}`);
+  }
   async getInfo() {
     try {
       const res = await this.api.info(this._id);
@@ -45823,7 +45833,11 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
       if (!res.data)
         return Promise.reject(res.message);
       const data = res.data;
-      this._status = { state: this.StatusAdapt(data), message: res.message };
+      this._status = {
+        state: this.StatusAdapt(data),
+        reason: data.state.phase,
+        message: res.message
+      };
       return {
         id: data.name,
         image: parseImageSpec(data.image),
@@ -45855,12 +45869,17 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
             await this.waitUntilDeleted();
             await this.create();
             return;
+          case "Error":
+            throw new ConnectionError(`Sandbox ${sandbox.id} is in error state: ${sandbox.status.reason ?? sandbox.status.message ?? "unknown"}`, this.config.baseUrl);
           default:
-            throw new ConnectionError(`Failed to ensure sandbox running`);
+            throw new ConnectionError(`Sandbox state ${status} not supported`, this.config.baseUrl);
         }
       }
       await this.create();
     } catch (error) {
+      if (error instanceof ConnectionError) {
+        throw error;
+      }
       throw new ConnectionError(`Failed to ensure sandbox running`, this.config.baseUrl, error);
     }
   }
@@ -45868,9 +45887,7 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
     try {
       this._status = { state: "Creating" };
       const res = await this.api.create(this.buildCreateRequest());
-      if (res.code !== 200 && res.code !== 201) {
-        throw new Error(res.message || `Devbox create failed with code ${res.code}`);
-      }
+      this.assertMutationSuccess(res, "create");
       await this.waitUntilReady();
       await new Promise((resolve) => setTimeout(resolve, 1000));
       this._status = { state: "Running" };
@@ -45881,7 +45898,8 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
   async stop() {
     try {
       this._status = { state: "Stopping" };
-      await this.api.stop(this._id);
+      const res = await this.api.stop(this._id);
+      this.assertMutationSuccess(res, "stop");
       this._status = { state: "Stopped" };
     } catch (error) {
       throw new CommandExecutionError("Failed to stop sandbox", "stop", error instanceof Error ? error : undefined);
@@ -45890,7 +45908,8 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
   async start() {
     try {
       this._status = { state: "Starting" };
-      await this.api.resume(this._id);
+      const res = await this.api.resume(this._id);
+      this.assertMutationSuccess(res, "resume");
       await this.waitUntilReady();
       this._status = { state: "Running" };
     } catch (error) {
@@ -45901,7 +45920,8 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
     try {
       const targetId = sandboxId ?? this._id;
       this._status = { state: "Deleting" };
-      await this.api.delete(targetId);
+      const res = await this.api.delete(targetId);
+      this.assertMutationSuccess(res, "delete", [404]);
       this._id = targetId;
       await this.waitUntilDeleted();
       this._status = { state: "UnExist" };
@@ -48362,16 +48382,44 @@ class OpenSandboxAdapter extends BaseSandboxAdapter {
   }
   async getSandboxBySessionId() {
     const manager = SandboxManager.create({ connectionConfig: this._connection });
-    const result = await manager.listSandboxInfos({
-      metadata: { sessionId: this.connectionConfig.sessionId }
-    });
-    const val = result.items[0];
-    if (val) {
-      const status = this.mapStatus(val.status);
-      return {
-        id: val.id,
-        status
-      };
+    try {
+      const result = await manager.listSandboxInfos({
+        metadata: { sessionId: this.connectionConfig.sessionId }
+      });
+      const val = result.items[0];
+      if (val) {
+        const status = this.mapStatus(val.status);
+        return {
+          id: val.id,
+          status
+        };
+      }
+    } finally {
+      await manager.close().catch(() => {
+        return;
+      });
+    }
+  }
+  async waitUntilSessionDeleted(timeoutMs = 120000) {
+    const startTime = Date.now();
+    const checkInterval = 1000;
+    while (Date.now() - startTime < timeoutMs) {
+      const sandbox = await this.getSandboxBySessionId();
+      if (!sandbox) {
+        return;
+      }
+      await this.sleep(checkInterval);
+    }
+    throw new SandboxStateError(`Sandbox session ${this.connectionConfig.sessionId} was not deleted within ${timeoutMs}ms`, "Deleting", "UnExist");
+  }
+  async killSandboxById(sandboxId) {
+    const manager = SandboxManager.create({ connectionConfig: this._connection });
+    try {
+      await manager.killSandbox(sandboxId);
+    } finally {
+      await manager.close().catch(() => {
+        return;
+      });
     }
   }
   async ensureRunning() {
@@ -48386,14 +48434,14 @@ class OpenSandboxAdapter extends BaseSandboxAdapter {
           break;
         case "Creating":
         case "Starting":
-          await this.waitUntilReady();
+          await this.connect(sandbox.id);
           break;
         case "Stopping":
         case "Stopped":
           await this.resume(sandbox.id);
           break;
         case "Deleting":
-          await this.waitUntilDeleted();
+          await this.waitUntilSessionDeleted();
           await this.create();
           break;
         case "Error":
@@ -48490,7 +48538,15 @@ class OpenSandboxAdapter extends BaseSandboxAdapter {
   async stop() {
     try {
       this._status = { state: "Stopping" };
-      await this.sandbox.kill();
+      const existing = await this.getSandboxBySessionId();
+      if (!existing) {
+        this._status = { state: "Stopped" };
+        return;
+      }
+      await this.killSandboxById(existing.id);
+      if (existing.id === this._id) {
+        this.sandbox = undefined;
+      }
       this._status = { state: "Stopped" };
     } catch (error) {
       const message = error instanceof SandboxException2 ? error.error.message : undefined;
@@ -48506,23 +48562,22 @@ class OpenSandboxAdapter extends BaseSandboxAdapter {
   async delete(sandboxId) {
     try {
       this._status = { state: "Deleting" };
-      if (sandboxId) {
-        const manager = SandboxManager.create({ connectionConfig: this._connection });
-        try {
-          await manager.killSandbox(sandboxId);
-        } finally {
-          await manager.close().catch(() => {
-            return;
-          });
-        }
-        if (sandboxId === this._id) {
+      const targetId = sandboxId ?? this._id;
+      if (targetId) {
+        await this.killSandboxById(targetId);
+        if (targetId === this._id) {
           this.sandbox = undefined;
         }
         this._status = { state: "UnExist" };
         return;
       }
-      await this.sandbox.kill();
-      this.sandbox = undefined;
+      const existing = await this.getSandboxBySessionId();
+      if (existing) {
+        await this.killSandboxById(existing.id);
+        if (existing.id === this._id) {
+          this.sandbox = undefined;
+        }
+      }
       this._status = { state: "UnExist" };
     } catch (error) {
       throw new CommandExecutionError("Failed to delete sandbox", "delete", error instanceof Error ? error : undefined);

package/dist/index.js

@@ -17395,7 +17395,7 @@ var require_fetch = __commonJS((exports, module) => {
       request.cache = "no-store";
     }
     const newConnection = forceNewConnection ? "yes" : "no";
-    if (request.mode === "websocket") {} else {}
+    if (request.mode === "websocket") {}
     let requestBody = null;
     if (request.body == null && fetchParams.processRequestEndOfBody) {
       queueMicrotask(() => fetchParams.processRequestEndOfBody());
@@ -45772,8 +45772,12 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
       case "Pending" /* Pending */:
         return "Creating";
       case "Paused" /* Paused */:
+      case "Stopped" /* Stopped */:
+      case "Shutdown" /* Shutdown */:
         return "Stopped";
       case "Pausing" /* Pausing */:
+      case "Stopping" /* Stopping */:
+      case "Shutting" /* Shutting */:
         return "Stopping";
       default:
         return "Error";
@@ -45799,6 +45803,12 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
   removeUndefined(obj) {
     return Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== undefined));
   }
+  assertMutationSuccess(res, action, okCodes = []) {
+    if (res.code >= 200 && res.code < 300 || okCodes.includes(res.code)) {
+      return;
+    }
+    throw new Error(res.message || `Devbox ${action} failed with code ${res.code}`);
+  }
   async getInfo() {
     try {
       const res = await this.api.info(this._id);
@@ -45807,7 +45817,11 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
       if (!res.data)
         return Promise.reject(res.message);
       const data = res.data;
-      this._status = { state: this.StatusAdapt(data), message: res.message };
+      this._status = {
+        state: this.StatusAdapt(data),
+        reason: data.state.phase,
+        message: res.message
+      };
       return {
         id: data.name,
         image: parseImageSpec(data.image),
@@ -45839,12 +45853,17 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
             await this.waitUntilDeleted();
             await this.create();
             return;
+          case "Error":
+            throw new ConnectionError(`Sandbox ${sandbox.id} is in error state: ${sandbox.status.reason ?? sandbox.status.message ?? "unknown"}`, this.config.baseUrl);
           default:
-            throw new ConnectionError(`Failed to ensure sandbox running`);
+            throw new ConnectionError(`Sandbox state ${status} not supported`, this.config.baseUrl);
         }
       }
       await this.create();
     } catch (error) {
+      if (error instanceof ConnectionError) {
+        throw error;
+      }
       throw new ConnectionError(`Failed to ensure sandbox running`, this.config.baseUrl, error);
     }
   }
@@ -45852,9 +45871,7 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
     try {
       this._status = { state: "Creating" };
       const res = await this.api.create(this.buildCreateRequest());
-      if (res.code !== 200 && res.code !== 201) {
-        throw new Error(res.message || `Devbox create failed with code ${res.code}`);
-      }
+      this.assertMutationSuccess(res, "create");
       await this.waitUntilReady();
       await new Promise((resolve) => setTimeout(resolve, 1000));
       this._status = { state: "Running" };
@@ -45865,7 +45882,8 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
   async stop() {
     try {
       this._status = { state: "Stopping" };
-      await this.api.stop(this._id);
+      const res = await this.api.stop(this._id);
+      this.assertMutationSuccess(res, "stop");
       this._status = { state: "Stopped" };
     } catch (error) {
       throw new CommandExecutionError("Failed to stop sandbox", "stop", error instanceof Error ? error : undefined);
@@ -45874,7 +45892,8 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
   async start() {
     try {
       this._status = { state: "Starting" };
-      await this.api.resume(this._id);
+      const res = await this.api.resume(this._id);
+      this.assertMutationSuccess(res, "resume");
       await this.waitUntilReady();
       this._status = { state: "Running" };
     } catch (error) {
@@ -45885,7 +45904,8 @@ class SealosDevboxAdapter extends BaseSandboxAdapter {
     try {
       const targetId = sandboxId ?? this._id;
       this._status = { state: "Deleting" };
-      await this.api.delete(targetId);
+      const res = await this.api.delete(targetId);
+      this.assertMutationSuccess(res, "delete", [404]);
       this._id = targetId;
       await this.waitUntilDeleted();
       this._status = { state: "UnExist" };
@@ -48346,16 +48366,44 @@ class OpenSandboxAdapter extends BaseSandboxAdapter {
   }
   async getSandboxBySessionId() {
     const manager = SandboxManager.create({ connectionConfig: this._connection });
-    const result = await manager.listSandboxInfos({
-      metadata: { sessionId: this.connectionConfig.sessionId }
-    });
-    const val = result.items[0];
-    if (val) {
-      const status = this.mapStatus(val.status);
-      return {
-        id: val.id,
-        status
-      };
+    try {
+      const result = await manager.listSandboxInfos({
+        metadata: { sessionId: this.connectionConfig.sessionId }
+      });
+      const val = result.items[0];
+      if (val) {
+        const status = this.mapStatus(val.status);
+        return {
+          id: val.id,
+          status
+        };
+      }
+    } finally {
+      await manager.close().catch(() => {
+        return;
+      });
+    }
+  }
+  async waitUntilSessionDeleted(timeoutMs = 120000) {
+    const startTime = Date.now();
+    const checkInterval = 1000;
+    while (Date.now() - startTime < timeoutMs) {
+      const sandbox = await this.getSandboxBySessionId();
+      if (!sandbox) {
+        return;
+      }
+      await this.sleep(checkInterval);
+    }
+    throw new SandboxStateError(`Sandbox session ${this.connectionConfig.sessionId} was not deleted within ${timeoutMs}ms`, "Deleting", "UnExist");
+  }
+  async killSandboxById(sandboxId) {
+    const manager = SandboxManager.create({ connectionConfig: this._connection });
+    try {
+      await manager.killSandbox(sandboxId);
+    } finally {
+      await manager.close().catch(() => {
+        return;
+      });
     }
   }
   async ensureRunning() {
@@ -48370,14 +48418,14 @@ class OpenSandboxAdapter extends BaseSandboxAdapter {
           break;
         case "Creating":
         case "Starting":
-          await this.waitUntilReady();
+          await this.connect(sandbox.id);
           break;
         case "Stopping":
         case "Stopped":
           await this.resume(sandbox.id);
           break;
         case "Deleting":
-          await this.waitUntilDeleted();
+          await this.waitUntilSessionDeleted();
           await this.create();
           break;
         case "Error":
@@ -48474,7 +48522,15 @@ class OpenSandboxAdapter extends BaseSandboxAdapter {
   async stop() {
     try {
       this._status = { state: "Stopping" };
-      await this.sandbox.kill();
+      const existing = await this.getSandboxBySessionId();
+      if (!existing) {
+        this._status = { state: "Stopped" };
+        return;
+      }
+      await this.killSandboxById(existing.id);
+      if (existing.id === this._id) {
+        this.sandbox = undefined;
+      }
       this._status = { state: "Stopped" };
     } catch (error) {
       const message = error instanceof SandboxException2 ? error.error.message : undefined;
@@ -48490,23 +48546,22 @@ class OpenSandboxAdapter extends BaseSandboxAdapter {
   async delete(sandboxId) {
     try {
       this._status = { state: "Deleting" };
-      if (sandboxId) {
-        const manager = SandboxManager.create({ connectionConfig: this._connection });
-        try {
-          await manager.killSandbox(sandboxId);
-        } finally {
-          await manager.close().catch(() => {
-            return;
-          });
-        }
-        if (sandboxId === this._id) {
+      const targetId = sandboxId ?? this._id;
+      if (targetId) {
+        await this.killSandboxById(targetId);
+        if (targetId === this._id) {
           this.sandbox = undefined;
         }
         this._status = { state: "UnExist" };
         return;
       }
-      await this.sandbox.kill();
-      this.sandbox = undefined;
+      const existing = await this.getSandboxBySessionId();
+      if (existing) {
+        await this.killSandboxById(existing.id);
+        if (existing.id === this._id) {
+          this.sandbox = undefined;
+        }
+      }
       this._status = { state: "UnExist" };
     } catch (error) {
       throw new CommandExecutionError("Failed to delete sandbox", "delete", error instanceof Error ? error : undefined);

package/dist/interfaces/ISandboxLifecycle.d.ts

@@ -28,7 +28,7 @@ export interface ISandboxLifecycle {
     /**
      * Delete the sandbox permanently.
      *
-     * When `sandboxId` is provided, implementations should delete that provider
+     * When `sandboxId` is provided, implementations should delete that target
      * sandbox directly without requiring callers to first bind the adapter via
      * `connect()`.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastgpt-sdk/sandbox-adapter",
-  "version": "0.0.39",
+  "version": "0.0.40-beta.1",
   "description": "Unified abstraction layer for cloud sandbox providers with adapter pattern and feature polyfilling",
   "type": "module",
   "main": "./dist/index.cjs",