@phpsandbox/sdk 0.0.28 → 0.0.30

package/dist/browser/phpsandbox-sdk.iife.js

@@ -336,6 +336,7 @@ var PHPSandbox = (() => {
     NotebookSecretApi: () => NotebookSecretApi,
     NotebookSecrets: () => NotebookSecrets,
     NotebookState: () => NotebookState,
+    NotebookUnavailableError: () => NotebookUnavailableError,
     PHPSandbox: () => PHPSandbox,
     PHPSandboxError: () => PHPSandboxError,
     PromiseTimeoutError: () => PromiseTimeoutError,
@@ -574,8 +575,7 @@ var PHPSandbox = (() => {
       };
       const subscription = new FilesystemSubscription(path, this.okra, wrappedDisposable);
       this.watches.set(path, { options, path, onDidChange });
-      this.okra.invoke("fs.watch", { path, options });
-      return subscription;
+      return this.okra.invoke("fs.watch", { path, options }).then(() => subscription);
     }
     exists(path) {
       return this.stat(path).then(() => true).catch(() => false);
@@ -615,6 +615,13 @@ var PHPSandbox = (() => {
       return new _SendTimeoutError(error.message, error.time);
     }
   };
+  var NotebookUnavailableError = class extends Error {
+    constructor(message = "Notebook is no longer available", raw = {}) {
+      super(message);
+      this.raw = raw;
+      this.name = "NotebookUnavailableError";
+    }
+  };
 
   // src/utils/promise.ts
   var timeout = (prom, time) => {
@@ -1062,6 +1069,103 @@ var PHPSandbox = (() => {
     }
   };
 
+  // src/services.ts
+  var Services = class {
+    constructor(okra) {
+      this.okra = okra;
+    }
+    list() {
+      return this.okra.invoke("service.list");
+    }
+    run(name) {
+      return this.okra.invoke("service.run", { name });
+    }
+    stop(name) {
+      return this.okra.invoke("service.stop", { name });
+    }
+    onLog(id, handler) {
+      return this.okra.listen(`service.log.${id}`, handler);
+    }
+    listen(event, handler) {
+      return this.okra.listen(event, handler);
+    }
+    logs(name, options = {}) {
+      if (options.follow) {
+        return this.followLogs(name, options);
+      }
+      return this.okra.invoke("service.logs", {
+        name,
+        tail: options.tail
+      }).then((response) => {
+        if (!("output" in response)) {
+          throw new Error(`Unexpected service.logs response for ${name}`);
+        }
+        return response.output;
+      });
+    }
+    followLogs(name, options) {
+      const id = options.id || nanoid();
+      const disposables = /* @__PURE__ */ new Set();
+      let controller = null;
+      let closed = false;
+      const dispose = () => {
+        for (const disposable of disposables) {
+          disposable.dispose();
+        }
+        disposables.clear();
+      };
+      const close = () => {
+        if (closed) {
+          return;
+        }
+        closed = true;
+        dispose();
+        if (controller) {
+          try {
+            controller.close();
+          } catch {
+          }
+        }
+      };
+      const fail = (error) => {
+        if (closed) {
+          return;
+        }
+        closed = true;
+        dispose();
+        if (controller) {
+          controller.error(error);
+        }
+      };
+      const stop = once(() => {
+        close();
+        return this.okra.invoke("service.stop-logs", { id });
+      });
+      const output = new ReadableStream({
+        start: (_controller) => {
+          controller = _controller;
+          disposables.add(
+            this.onLog(id, (data) => {
+              controller?.enqueue(data.output);
+            })
+          );
+          void this.okra.invoke("service.logs", {
+            name,
+            tail: options.tail,
+            follow: true,
+            id
+          }).catch((error) => {
+            fail(error);
+          });
+        },
+        cancel: () => {
+          void stop();
+        }
+      });
+      return { id, output, stop };
+    }
+  };
+
   // node_modules/@msgpack/msgpack/dist.esm/utils/utf8.mjs
   function utf8Count(str) {
     const strLength = str.length;
@@ -3085,6 +3189,7 @@ var PHPSandbox = (() => {
       this.closed = false;
       this.disposables = new NamedDisposable();
       this.connectPromise = null;
+      this.terminalError = null;
       this.pingIntervalStarted = false;
       // Connection health monitoring
       this.connectionStats = {
@@ -3116,7 +3221,7 @@ var PHPSandbox = (() => {
       const startClosed = options.startClosed !== false;
       this.rws = new reconnecting_websocket_mjs_default(this.url.toString(), [], {
         WebSocket: globalThis.WebSocket ?? browser_default,
-        connectionTimeout: options.connectionTimeout ?? 1e3,
+        connectionTimeout: options.connectionTimeout,
         maxReconnectionDelay: 2e3,
         minReconnectionDelay: 200,
         maxEnqueuedMessages: 0,
@@ -3159,6 +3264,9 @@ var PHPSandbox = (() => {
      * Ensure the websocket is open without requiring an application-level roundtrip.
      */
     connect() {
+      if (this.terminalError) {
+        return Promise.reject(this.terminalError);
+      }
       return __privateMethod(this, _Transport_instances, connect_fn).call(this);
     }
     id() {
@@ -3215,7 +3323,12 @@ var PHPSandbox = (() => {
           return;
         }
         if (event === "Events.BootError" /* BootError */) {
+          const error = new NotebookUnavailableError(
+            data?.message || "Notebook is no longer available",
+            data || {}
+          );
           this.log("error", "Boot error received", { data });
+          this.terminate(error, 4e3, error.message);
           return;
         }
         if (event === "response" /* Response */) {
@@ -3274,6 +3387,11 @@ var PHPSandbox = (() => {
     listen(event, listener, _context) {
       return this.eventEmitter.listen(event, listener);
     }
+    onDidBootError(listener) {
+      this.eventEmitter.listen("transport.boot_error", (event) => {
+        listener(event.error);
+      });
+    }
     removeListener(event, listener) {
       this.eventEmitter.removeListener(event, listener);
     }
@@ -3300,6 +3418,9 @@ var PHPSandbox = (() => {
     get isClosed() {
       return this.closed;
     }
+    getTerminalError() {
+      return this.terminalError;
+    }
     get status() {
       return {
         0: "CONNECTING",
@@ -3309,6 +3430,9 @@ var PHPSandbox = (() => {
       }[this.rws.readyState];
     }
     async call(action, data = {}, options = {}) {
+      if (this.terminalError) {
+        throw this.terminalError;
+      }
       if (this.isRateLimited()) {
         throw new RateLimitError("Rate limit exceeded - too many requests");
       }
@@ -3325,6 +3449,10 @@ var PHPSandbox = (() => {
         this.eventEmitter.removeListener(errorEvent);
       };
       const handler = async (resolve, reject) => {
+        if (this.terminalError) {
+          reject(this.terminalError);
+          return;
+        }
         const abortError = new DOMException("Request aborted", "AbortError");
         if (options.abortSignal?.aborted) {
           reject(abortError);
@@ -3376,7 +3504,7 @@ var PHPSandbox = (() => {
             reject(new RateLimitError(_ev.reason || "Rate limit exceeded", _ev));
             return;
           }
-          reject(new Error(`Connection lost to the notebook during request: ${_ev.reason || "Unknown reason"}`));
+          reject(this.terminalError || new Error(`Connection lost to the notebook during request: ${_ev.reason || "Unknown reason"}`));
         };
         this.rws.addEventListener("close", closeHandler);
         this.rws.addEventListener("error", closeHandler);
@@ -3412,7 +3540,7 @@ var PHPSandbox = (() => {
           try {
             return await sender();
           } catch (e) {
-            if (e instanceof ErrorEvent || e instanceof RateLimitError || e instanceof InvalidConfigurationError || e instanceof InvalidMessageError || e instanceof DOMException) {
+            if (e instanceof ErrorEvent || e instanceof RateLimitError || e instanceof InvalidConfigurationError || e instanceof InvalidMessageError || e instanceof NotebookUnavailableError || e instanceof DOMException) {
               this.log("debug", "Non-retryable error, bailing", {
                 error: e.message,
                 attempt
@@ -3464,6 +3592,9 @@ var PHPSandbox = (() => {
      * This preserves all event listeners and state.
      */
     reconnect() {
+      if (this.terminalError) {
+        throw this.terminalError;
+      }
       if (this.closed) {
         throw new Error("Cannot reconnect a closed transport. The transport has been permanently closed.");
       }
@@ -3478,6 +3609,16 @@ var PHPSandbox = (() => {
       }
       this.close();
     }
+    terminate(error, code = 4e3, reason = error.message) {
+      this.terminalError = error;
+      if (error instanceof NotebookUnavailableError) {
+        this.eventEmitter.emit("transport.boot_error", {
+          error,
+          timestamp: Date.now()
+        });
+      }
+      this.close(code, reason);
+    }
     close(code, reason) {
       if (this.closed) {
         return;
@@ -3485,9 +3626,9 @@ var PHPSandbox = (() => {
       this.log("info", "Closing transport connection", { code, reason });
       this.connectPromise = null;
       const queuedCount = this.messageQueue.length;
+      const closeError = this.terminalError || new Error("Connection closed while message was queued");
       this.messageQueue.forEach((msg) => {
-        console.log("Rejecting queued message due to connection close");
-        msg.reject(new Error("Connection closed while message was queued"));
+        msg.reject(closeError);
       });
       this.messageQueue = [];
       if (queuedCount > 0) {
@@ -3575,6 +3716,9 @@ var PHPSandbox = (() => {
           this.log("error", "Connection closed due to policy violation");
           this.clearOldQueuedMessages();
           return "stop";
+        case 4e3:
+          this.log("info", "Connection closed due to terminal notebook error");
+          return "stop";
         default:
           this.log("warn", `Unknown close code: ${code}, will reconnect`);
           return "reconnect";
@@ -3790,6 +3934,9 @@ var PHPSandbox = (() => {
    * by caching the connection promise.
    */
   connect_fn = function() {
+    if (this.terminalError) {
+      return Promise.reject(this.terminalError);
+    }
     if (this.isConnected) {
       return Promise.resolve();
     }
@@ -4836,9 +4983,14 @@ var PHPSandbox = (() => {
       this.laravel = new Lravel(this);
       this.shell = new Shell(this);
       this.git = new Git(this);
+      this.services = new Services(this);
       this.secrets = new NotebookSecrets(client, this.data.id);
     }
     async ready() {
+      const terminalError = this.socket.getTerminalError();
+      if (terminalError) {
+        throw terminalError;
+      }
       const ready = async () => {
         if (this.client.options.startClosed && !this.socket.isConnected) {
           await this.socket.connect();
@@ -4851,7 +5003,9 @@ var PHPSandbox = (() => {
       return this.client.notebook.fork(this.data.id);
     }
     delete() {
-      return this.client.notebook.delete(this.data.id);
+      return this.client.notebook.delete(this.data.id).then(() => {
+        this.socket.terminate(new NotebookUnavailableError("Notebook has been deleted.", { id: this.data.id }));
+      });
     }
     stop() {
       return this.container.stop();
@@ -4875,6 +5029,10 @@ var PHPSandbox = (() => {
       !this.socket.isClosed && this.socket.disconnect();
     }
     connected() {
+      const terminalError = this.socket.getTerminalError();
+      if (terminalError) {
+        return Promise.reject(terminalError);
+      }
       if (this.socket.isConnected) {
         return Promise.resolve(this);
       }
@@ -4882,18 +5040,24 @@ var PHPSandbox = (() => {
         try {
           this.socket.onDidConnect(() => resolve(this));
           this.socket.onDidClose(() => reject(new Error("Connection closed")));
+          this.socket.onDidBootError((error) => reject(error));
         } catch (e) {
           reject(e);
         }
       });
     }
     whenConnected() {
+      const terminalError = this.socket.getTerminalError();
+      if (terminalError) {
+        return Promise.reject(terminalError);
+      }
       if (this.socket.isConnected) {
         return Promise.resolve(this);
       }
       return new Promise((resolve, reject) => {
         try {
           this.socket.onDidConnect(() => resolve(this));
+          this.socket.onDidBootError((error) => reject(error));
         } catch (e) {
           reject(e);
         }
@@ -4910,6 +5074,11 @@ var PHPSandbox = (() => {
         this.socket.emit("okra.disconnected");
         this.initialized = false;
       });
+      this.socket.onDidBootError((error) => {
+        this.socket.emit("okra.boot_error", error);
+        this.socket.emit("okra.disconnected");
+        this.initialized = false;
+      });
     }
     onDidConnect(handler) {
       this.socket.removeListener("okra.connected", handler);
@@ -4922,6 +5091,11 @@ var PHPSandbox = (() => {
       this.disposables.push(disposable);
       return disposable;
     }
+    onDidBootError(handler) {
+      const disposable = this.socket.listen("okra.boot_error", handler);
+      this.disposables.push(disposable);
+      return disposable;
+    }
     update() {
       return this.invoke("notebook.update");
     }
@@ -4947,6 +5121,7 @@ var PHPSandbox = (() => {
   init_fn = function() {
     __privateSet(this, _initPromise, new Promise((resolve, reject) => {
       const initializationListener = this.onDidInitialize((result) => {
+        bootErrorListener.dispose();
         initializationListener.dispose();
         this.initialized = result;
         if (result.type === "error") {
@@ -4955,6 +5130,11 @@ var PHPSandbox = (() => {
         }
         resolve(result);
       });
+      const bootErrorListener = this.onDidBootError((error) => {
+        initializationListener.dispose();
+        bootErrorListener.dispose();
+        reject(error);
+      });
     }));
     return __privateGet(this, _initPromise);
   };