@phpsandbox/sdk 0.0.49 → 0.0.52

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

@@ -36,6 +36,7 @@ var PHPSandbox = (() => {
     Client: () => Client,
     CommandError: () => CommandError,
     ErrorEvent: () => ErrorEvent,
+    FileChangeFilter: () => FileChangeFilter,
     FileChangeType: () => FileChangeType,
     FileType: () => FileType,
     Filesystem: () => Filesystem,
@@ -106,6 +107,12 @@ var PHPSandbox = (() => {
     FileType2[FileType2["SymbolicLink"] = 64] = "SymbolicLink";
     return FileType2;
   })(FileType || {});
+  var FileChangeFilter = /* @__PURE__ */ ((FileChangeFilter2) => {
+    FileChangeFilter2[FileChangeFilter2["UPDATED"] = 2] = "UPDATED";
+    FileChangeFilter2[FileChangeFilter2["ADDED"] = 4] = "ADDED";
+    FileChangeFilter2[FileChangeFilter2["DELETED"] = 8] = "DELETED";
+    return FileChangeFilter2;
+  })(FileChangeFilter || {});
   var FileChangeType = /* @__PURE__ */ ((FileChangeType2) => {
     FileChangeType2[FileChangeType2["UPDATED"] = 1] = "UPDATED";
     FileChangeType2[FileChangeType2["ADDED"] = 2] = "ADDED";
@@ -128,14 +135,18 @@ var PHPSandbox = (() => {
     }
   };
   var FilesystemSubscription = class {
-    constructor(path, okra, disposable) {
-      this.path = path;
-      this.okra = okra;
+    constructor(disposable, onDispose) {
       this.disposable = disposable;
+      this.onDispose = onDispose;
+      this.disposed = false;
     }
     dispose() {
-      this.okra.invoke("fs.unwatch", { path: this.path });
+      if (this.disposed) {
+        return;
+      }
+      this.disposed = true;
       this.disposable.dispose();
+      this.onDispose();
     }
   };
   var Filesystem = class {
@@ -146,8 +157,9 @@ var PHPSandbox = (() => {
     }
     watchOkraConnection() {
       this.okra.onDidConnect(() => {
-        for (const { path, options, onDidChange } of this.watches.values()) {
-          this.watch(path, options, onDidChange);
+        for (const { path, options } of this.watches.values()) {
+          void this.okra.invoke("fs.watch", { path, options }).catch(() => {
+          });
         }
       });
     }
@@ -165,7 +177,7 @@ var PHPSandbox = (() => {
     }) {
       return this.okra.invoke("fs.find", {
         query,
-        options: Object.assign(options, {
+        options: {
           includes: [],
           excludes: [
             "**/storage",
@@ -182,8 +194,9 @@ var PHPSandbox = (() => {
           useIgnoreFiles: false,
           followSymlinks: false,
           useGlobalIgnoreFiles: false,
-          useParentIgnoreFiles: false
-        })
+          useParentIgnoreFiles: false,
+          ...options
+        }
       });
     }
     search(query, options, onMatch) {
@@ -289,12 +302,21 @@ var PHPSandbox = (() => {
       const wrappedDisposable = {
         dispose: () => {
           disposable.dispose();
-          this.okra.invoke("fs.unwatch", { path });
+          void this.okra.invoke("fs.unwatch", { path }).catch(() => {
+          });
         }
       };
-      const subscription = new FilesystemSubscription(path, this.okra, wrappedDisposable);
+      const subscription = new FilesystemSubscription(wrappedDisposable, () => {
+        const watch = this.watches.get(path);
+        if (watch?.onDidChange === onDidChange) {
+          this.watches.delete(path);
+        }
+      });
       this.watches.set(path, { options, path, onDidChange });
-      return this.okra.invoke("fs.watch", { path, options }).then(() => subscription);
+      return this.okra.invoke("fs.watch", { path, options }).then(() => subscription).catch((error) => {
+        subscription.dispose();
+        throw error;
+      });
     }
     exists(path) {
       return this.stat(path).then(() => true).catch(() => false);
@@ -303,13 +325,13 @@ var PHPSandbox = (() => {
       const id = nanoid();
       const stream = !!chunk;
       const chunks = [];
-      this.okra.listen(
+      const disposable = this.okra.listen(
         `fs.download.${id}`,
         stream ? chunk : (data) => {
           chunks.push(data);
         }
       );
-      return this.okra.invoke("fs.download", { id, exclude, include }).then(() => new Blob(chunks, { type: "application/octet-stream" }));
+      return this.okra.invoke("fs.download", { id, exclude, include }).then(() => new Blob(chunks, { type: "application/octet-stream" })).finally(() => disposable.dispose());
     }
     tree(path = "/") {
       return this.okra.invoke("fs.tree", { path });
@@ -374,13 +396,13 @@ var PHPSandbox = (() => {
       return this.okra.invoke("terminal.create", input);
     }
     onStarted(handler) {
-      this.okra.listen("terminal.started", handler);
+      return this.okra.listen("terminal.started", handler);
     }
     resize(id, size) {
       return this.okra.invoke("terminal.resize", { id, width: size[0], height: size[1] });
     }
     onOutput(id, handler) {
-      this.okra.listen(`terminal.output.${id}`, handler);
+      return this.okra.listen(`terminal.output.${id}`, handler);
     }
     input(id, input) {
       return Promise.resolve(this.okra.send("terminal.input", { id, input }));
@@ -390,46 +412,61 @@ var PHPSandbox = (() => {
     }
     async attach(id, opts) {
       const handle = this.processHandle(id, opts?.abortSignal);
-      const task = await this.okra.invoke(
-        "terminal.attach",
-        {
-          id,
-          replayHistory: opts?.replayHistory
-        },
-        { abortSignal: opts?.abortSignal }
-      );
-      if (!task) {
+      try {
+        const task = await this.okra.invoke(
+          "terminal.attach",
+          {
+            id,
+            replayHistory: opts?.replayHistory
+          },
+          { abortSignal: opts?.abortSignal }
+        );
+        if (!task) {
+          handle.dispose();
+          return false;
+        }
+        return {
+          ...handle.process,
+          ...task
+        };
+      } catch (error) {
         handle.dispose();
-        return false;
+        throw error;
       }
-      return {
-        ...handle.process,
-        ...task
-      };
     }
     async spawn(command, args, opts) {
       const id = opts?.id || nanoid();
       const handle = this.processHandle(id, opts?.abortSignal);
       const { abortSignal, ...otherOpts } = opts ?? {};
-      const result = await this.okra.invoke(
-        "terminal.spawn",
-        {
-          command: [command, ...args],
-          opts: {
-            id,
-            ...otherOpts
-          }
-        },
-        { abortSignal }
-      );
-      return {
-        ...handle.process,
-        ...result
-      };
+      try {
+        const result = await this.okra.invoke(
+          "terminal.spawn",
+          {
+            command: [command, ...args],
+            opts: {
+              id,
+              ...otherOpts
+            }
+          },
+          { abortSignal }
+        );
+        return {
+          ...handle.process,
+          ...result
+        };
+      } catch (error) {
+        handle.dispose();
+        throw error;
+      }
     }
     processHandle(id, abortSignal) {
       const disposables = /* @__PURE__ */ new Set();
+      let abortHandler;
       const dispose = () => {
+        if (abortHandler) {
+          abortSignal?.removeEventListener("abort", abortHandler);
+          abortHandler = void 0;
+        }
         for (const disposable of disposables) {
           disposable.dispose();
         }
@@ -508,8 +545,11 @@ var PHPSandbox = (() => {
       const resize = (dimensions) => {
         this.okra.invoke("terminal.resize", { id, width: dimensions.cols, height: dimensions.rows });
       };
-      if (abortSignal) {
-        abortSignal.addEventListener("abort", kill);
+      if (abortSignal && !abortSignal.aborted) {
+        abortHandler = () => {
+          void kill();
+        };
+        abortSignal.addEventListener("abort", abortHandler, { once: true });
       }
       return {
         process: {
@@ -603,19 +643,19 @@ var PHPSandbox = (() => {
       return this.okra.invoke("lsp.message", { id, message });
     }
     listen(id, event, cb) {
-      this.okra.listen(`${event}.${id}`, (e) => cb(e));
+      return this.okra.listen(`${event}.${id}`, (e) => cb(e));
     }
     onClose(id, cb) {
-      this.listen(id, "lsp.closed", (e) => cb(e.code, e.reason));
+      return this.listen(id, "lsp.closed", (e) => cb(e.code, e.reason));
     }
     onError(id, cb) {
-      this.listen(id, "lsp.error", (e) => cb(e.message));
+      return this.listen(id, "lsp.error", (e) => cb(e.message));
     }
     onClientDisconnect(cb) {
-      this.okra.onDidDisconnect(() => cb(1e3, "OKRA DISCONNECTED"));
+      return this.okra.onDidDisconnect(() => cb(1e3, "OKRA DISCONNECTED"));
     }
     onResponse(id, cb) {
-      this.listen(id, "lsp.response", (e) => cb(JSON.stringify(e)));
+      return this.listen(id, "lsp.response", (e) => cb(JSON.stringify(e)));
     }
     close(id) {
       return this.okra.invoke("lsp.close", { id });
@@ -639,13 +679,13 @@ var PHPSandbox = (() => {
       return this.lsp.message(this.id, content);
     }
     onMessage(cb) {
-      this.lsp.onResponse(this.id, cb);
+      return this.lsp.onResponse(this.id, cb);
     }
     onError(cb) {
-      this.lsp.onError(this.id, cb);
+      return this.lsp.onError(this.id, cb);
     }
     onClose(cb) {
-      this.lsp.onClose(this.id, cb);
+      return this.lsp.onClose(this.id, cb);
     }
     dispose() {
       this.lsp.close(this.id);
@@ -654,7 +694,7 @@ var PHPSandbox = (() => {
       this.lsp.start(this.id);
     }
     onClientDisconnect(cb) {
-      this.lsp.onClientDisconnect(cb);
+      return this.lsp.onClientDisconnect(cb);
     }
     whenSocketConnected() {
       return this.lsp.whenSocketConnected();
@@ -704,12 +744,12 @@ var PHPSandbox = (() => {
       return this.okra.listen("notebook.log", fn);
     }
     listen(event, handler) {
-      this.okra.listen(event, handler);
+      return this.okra.listen(event, handler);
     }
   };
 
   // src/laravel.ts
-  var Lravel = class {
+  var Laravel = class {
     constructor(okra) {
       this.okra = okra;
     }
@@ -742,10 +782,10 @@ var PHPSandbox = (() => {
       return this.okra.invoke("repl.resize", { cols, rows });
     }
     listen(event, handler) {
-      this.okra.listen(event, handler);
+      return this.okra.listen(event, handler);
     }
     onOutput(handler) {
-      this.okra.listen("repl.output", handler);
+      return this.okra.listen("repl.output", handler);
     }
   };
 
@@ -782,7 +822,7 @@ var PHPSandbox = (() => {
       this.okra = okra;
     }
     onOutput(id, handler) {
-      this.okra.listen(`shell.output.${id}`, handler);
+      return this.okra.listen(`shell.output.${id}`, handler);
     }
     listen(event, handler) {
       return this.okra.listen(event, handler);
@@ -2435,6 +2475,10 @@ var PHPSandbox = (() => {
   }
 
   // node_modules/reconnecting-websocket/dist/reconnecting-websocket-mjs.js
+  var reconnecting_websocket_mjs_exports = {};
+  __export(reconnecting_websocket_mjs_exports, {
+    default: () => reconnecting_websocket_mjs_default
+  });
   var extendStatics = function(d, b) {
     extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
       d2.__proto__ = b2;
@@ -2547,7 +2591,7 @@ var PHPSandbox = (() => {
   var ReconnectingWebSocket = (
     /** @class */
     (function() {
-      function ReconnectingWebSocket2(url, protocols, options) {
+      function ReconnectingWebSocket3(url, protocols, options) {
         var _this = this;
         if (options === void 0) {
           options = {};
@@ -2629,63 +2673,63 @@ var PHPSandbox = (() => {
         }
         this._connect();
       }
-      Object.defineProperty(ReconnectingWebSocket2, "CONNECTING", {
+      Object.defineProperty(ReconnectingWebSocket3, "CONNECTING", {
         get: function() {
           return 0;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2, "OPEN", {
+      Object.defineProperty(ReconnectingWebSocket3, "OPEN", {
         get: function() {
           return 1;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2, "CLOSING", {
+      Object.defineProperty(ReconnectingWebSocket3, "CLOSING", {
         get: function() {
           return 2;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2, "CLOSED", {
+      Object.defineProperty(ReconnectingWebSocket3, "CLOSED", {
         get: function() {
           return 3;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "CONNECTING", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "CONNECTING", {
         get: function() {
-          return ReconnectingWebSocket2.CONNECTING;
+          return ReconnectingWebSocket3.CONNECTING;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "OPEN", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "OPEN", {
         get: function() {
-          return ReconnectingWebSocket2.OPEN;
+          return ReconnectingWebSocket3.OPEN;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "CLOSING", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "CLOSING", {
         get: function() {
-          return ReconnectingWebSocket2.CLOSING;
+          return ReconnectingWebSocket3.CLOSING;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "CLOSED", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "CLOSED", {
         get: function() {
-          return ReconnectingWebSocket2.CLOSED;
+          return ReconnectingWebSocket3.CLOSED;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "binaryType", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "binaryType", {
         get: function() {
           return this._ws ? this._ws.binaryType : this._binaryType;
         },
@@ -2698,7 +2742,7 @@ var PHPSandbox = (() => {
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "retryCount", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "retryCount", {
         /**
          * Returns the number or connection retries
          */
@@ -2708,7 +2752,7 @@ var PHPSandbox = (() => {
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "bufferedAmount", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "bufferedAmount", {
         /**
          * The number of bytes of data that have been queued using calls to send() but not yet
          * transmitted to the network. This value resets to zero once all queued data has been sent.
@@ -2731,7 +2775,7 @@ var PHPSandbox = (() => {
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "extensions", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "extensions", {
         /**
          * The extensions selected by the server. This is currently only the empty string or a list of
          * extensions as negotiated by the connection
@@ -2742,7 +2786,7 @@ var PHPSandbox = (() => {
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "protocol", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "protocol", {
         /**
          * A string indicating the name of the sub-protocol the server selected;
          * this will be one of the strings specified in the protocols parameter when creating the
@@ -2754,7 +2798,7 @@ var PHPSandbox = (() => {
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "readyState", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "readyState", {
         /**
          * The current state of the connection; this is one of the Ready state constants
          */
@@ -2762,12 +2806,12 @@ var PHPSandbox = (() => {
           if (this._ws) {
             return this._ws.readyState;
           }
-          return this._options.startClosed ? ReconnectingWebSocket2.CLOSED : ReconnectingWebSocket2.CONNECTING;
+          return this._options.startClosed ? ReconnectingWebSocket3.CLOSED : ReconnectingWebSocket3.CONNECTING;
         },
         enumerable: true,
         configurable: true
       });
-      Object.defineProperty(ReconnectingWebSocket2.prototype, "url", {
+      Object.defineProperty(ReconnectingWebSocket3.prototype, "url", {
         /**
          * The URL as resolved by the constructor
          */
@@ -2777,7 +2821,7 @@ var PHPSandbox = (() => {
         enumerable: true,
         configurable: true
       });
-      ReconnectingWebSocket2.prototype.close = function(code, reason) {
+      ReconnectingWebSocket3.prototype.close = function(code, reason) {
         if (code === void 0) {
           code = 1e3;
         }
@@ -2794,7 +2838,7 @@ var PHPSandbox = (() => {
         }
         this._ws.close(code, reason);
       };
-      ReconnectingWebSocket2.prototype.reconnect = function(code, reason) {
+      ReconnectingWebSocket3.prototype.reconnect = function(code, reason) {
         this._shouldReconnect = true;
         this._closeCalled = false;
         this._retryCount = -1;
@@ -2805,7 +2849,7 @@ var PHPSandbox = (() => {
           this._connect();
         }
       };
-      ReconnectingWebSocket2.prototype.send = function(data) {
+      ReconnectingWebSocket3.prototype.send = function(data) {
         if (this._ws && this._ws.readyState === this.OPEN) {
           this._debug("send", data);
           this._ws.send(data);
@@ -2817,12 +2861,12 @@ var PHPSandbox = (() => {
           }
         }
       };
-      ReconnectingWebSocket2.prototype.addEventListener = function(type, listener) {
+      ReconnectingWebSocket3.prototype.addEventListener = function(type, listener) {
         if (this._listeners[type]) {
           this._listeners[type].push(listener);
         }
       };
-      ReconnectingWebSocket2.prototype.dispatchEvent = function(event) {
+      ReconnectingWebSocket3.prototype.dispatchEvent = function(event) {
         var e_1, _a;
         var listeners = this._listeners[event.type];
         if (listeners) {
@@ -2843,14 +2887,14 @@ var PHPSandbox = (() => {
         }
         return true;
       };
-      ReconnectingWebSocket2.prototype.removeEventListener = function(type, listener) {
+      ReconnectingWebSocket3.prototype.removeEventListener = function(type, listener) {
         if (this._listeners[type]) {
           this._listeners[type] = this._listeners[type].filter(function(l) {
             return l !== listener;
           });
         }
       };
-      ReconnectingWebSocket2.prototype._debug = function() {
+      ReconnectingWebSocket3.prototype._debug = function() {
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
           args[_i] = arguments[_i];
@@ -2859,7 +2903,7 @@ var PHPSandbox = (() => {
           console.log.apply(console, __spread(["RWS>"], args));
         }
       };
-      ReconnectingWebSocket2.prototype._getNextDelay = function() {
+      ReconnectingWebSocket3.prototype._getNextDelay = function() {
         var _a = this._options, _b = _a.reconnectionDelayGrowFactor, reconnectionDelayGrowFactor = _b === void 0 ? DEFAULT.reconnectionDelayGrowFactor : _b, _c = _a.minReconnectionDelay, minReconnectionDelay = _c === void 0 ? DEFAULT.minReconnectionDelay : _c, _d = _a.maxReconnectionDelay, maxReconnectionDelay = _d === void 0 ? DEFAULT.maxReconnectionDelay : _d;
         var delay = 0;
         if (this._retryCount > 0) {
@@ -2871,13 +2915,13 @@ var PHPSandbox = (() => {
         this._debug("next delay", delay);
         return delay;
       };
-      ReconnectingWebSocket2.prototype._wait = function() {
+      ReconnectingWebSocket3.prototype._wait = function() {
         var _this = this;
         return new Promise(function(resolve) {
           setTimeout(resolve, _this._getNextDelay());
         });
       };
-      ReconnectingWebSocket2.prototype._getNextUrl = function(urlProvider) {
+      ReconnectingWebSocket3.prototype._getNextUrl = function(urlProvider) {
         if (typeof urlProvider === "string") {
           return Promise.resolve(urlProvider);
         }
@@ -2892,7 +2936,7 @@ var PHPSandbox = (() => {
         }
         throw Error("Invalid URL");
       };
-      ReconnectingWebSocket2.prototype._connect = function() {
+      ReconnectingWebSocket3.prototype._connect = function() {
         var _this = this;
         if (this._connectLock || !this._shouldReconnect) {
           return;
@@ -2925,11 +2969,11 @@ var PHPSandbox = (() => {
           }, connectionTimeout);
         });
       };
-      ReconnectingWebSocket2.prototype._handleTimeout = function() {
+      ReconnectingWebSocket3.prototype._handleTimeout = function() {
         this._debug("timeout event");
         this._handleError(new ErrorEvent2(Error("TIMEOUT"), this));
       };
-      ReconnectingWebSocket2.prototype._disconnect = function(code, reason) {
+      ReconnectingWebSocket3.prototype._disconnect = function(code, reason) {
         if (code === void 0) {
           code = 1e3;
         }
@@ -2944,18 +2988,18 @@ var PHPSandbox = (() => {
         } catch (error) {
         }
       };
-      ReconnectingWebSocket2.prototype._acceptOpen = function() {
+      ReconnectingWebSocket3.prototype._acceptOpen = function() {
         this._debug("accept open");
         this._retryCount = 0;
       };
-      ReconnectingWebSocket2.prototype._callEventListener = function(event, listener) {
+      ReconnectingWebSocket3.prototype._callEventListener = function(event, listener) {
         if ("handleEvent" in listener) {
           listener.handleEvent(event);
         } else {
           listener(event);
         }
       };
-      ReconnectingWebSocket2.prototype._removeListeners = function() {
+      ReconnectingWebSocket3.prototype._removeListeners = function() {
         if (!this._ws) {
           return;
         }
@@ -2965,7 +3009,7 @@ var PHPSandbox = (() => {
         this._ws.removeEventListener("message", this._handleMessage);
         this._ws.removeEventListener("error", this._handleError);
       };
-      ReconnectingWebSocket2.prototype._addListeners = function() {
+      ReconnectingWebSocket3.prototype._addListeners = function() {
         if (!this._ws) {
           return;
         }
@@ -2975,11 +3019,11 @@ var PHPSandbox = (() => {
         this._ws.addEventListener("message", this._handleMessage);
         this._ws.addEventListener("error", this._handleError);
       };
-      ReconnectingWebSocket2.prototype._clearTimeouts = function() {
+      ReconnectingWebSocket3.prototype._clearTimeouts = function() {
         clearTimeout(this._connectTimeout);
         clearTimeout(this._uptimeTimeout);
       };
-      return ReconnectingWebSocket2;
+      return ReconnectingWebSocket3;
     })()
   );
   var reconnecting_websocket_mjs_default = ReconnectingWebSocket;
@@ -3104,6 +3148,7 @@ var PHPSandbox = (() => {
   };
 
   // src/socket/index.ts
+  var ReconnectingWebSocket2 = reconnecting_websocket_mjs_default ?? reconnecting_websocket_mjs_exports;
   var ConnectionTimeoutError = class extends Error {
     constructor(message = "WebSocket connection timeout") {
       super(message);
@@ -3142,30 +3187,13 @@ var PHPSandbox = (() => {
       this.connectPromise = null;
       this.terminalError = null;
       this.pingIntervalStarted = false;
-      // Connection health monitoring
-      this.connectionStats = {
-        connectTime: 0,
-        reconnectCount: 0,
-        lastPingTime: 0,
-        lastPongTime: 0,
-        avgResponseTime: 0,
-        totalMessages: 0,
-        totalErrors: 0,
-        connectionStartTime: 0
-      };
-      // Message queue for disconnection handling
-      this.messageQueue = [];
-      this.MAX_QUEUE_SIZE = 100;
-      this.QUEUE_TIMEOUT = 3e4;
-      // 30 seconds
       this.incomingMessageChain = Promise.resolve();
       this.validateConfiguration(options);
       this.url = new URL(url);
       this.PING_INTERVAL = options.pingInterval ?? 3e4;
       this.CONNECT_WAIT_TIMEOUT = options.connectWaitTimeout ?? 3e4;
-      this.connectionStats.connectionStartTime = Date.now();
       const startClosed = options.startClosed !== false;
-      this.rws = new reconnecting_websocket_mjs_default(this.url.toString(), [], {
+      this.rws = new ReconnectingWebSocket2(this.url.toString(), [], {
         WebSocket: options.webSocket ?? globalThis.WebSocket ?? browser_default,
         connectionTimeout: options.connectionTimeout,
         maxReconnectionDelay: 2e3,
@@ -3179,8 +3207,6 @@ var PHPSandbox = (() => {
         options
       });
       this.registerWatchers();
-      this.setupConnectionHealthMonitoring();
-      this.startPeriodicMaintenance();
     }
     /**
      * Validate configuration options
@@ -3224,7 +3250,6 @@ var PHPSandbox = (() => {
     async registerWatchers() {
       const onMessage = (ev) => {
         this.incomingMessageChain = this.incomingMessageChain.catch(() => void 0).then(() => this.processIncomingMessage(ev)).catch((error) => {
-          this.connectionStats.totalErrors++;
           this.log("error", "Failed to process queued WebSocket frame", {
             error: error instanceof Error ? error.message : String(error)
           });
@@ -3244,11 +3269,12 @@ var PHPSandbox = (() => {
       });
     }
     async processIncomingMessage(ev) {
-      if (!(ev.data instanceof Blob)) {
-        const error = new Error("Unexpected message type: " + typeof ev.data);
-        this.connectionStats.totalErrors++;
+      let buffer;
+      try {
+        buffer = await this.toArrayBuffer(ev.data);
+      } catch (error) {
         this.log("error", "Unexpected WebSocket message type", {
-          error: error.message,
+          error: error instanceof Error ? error.message : String(error),
           messageType: typeof ev.data
         });
         this.eventEmitter.emit("transport.error", {
@@ -3259,7 +3285,6 @@ var PHPSandbox = (() => {
         });
         return;
       }
-      const buffer = await ev.data.arrayBuffer();
       if (buffer.byteLength === 0) {
         this.log("warn", "Ignoring empty WebSocket frame");
         return;
@@ -3268,7 +3293,6 @@ var PHPSandbox = (() => {
       try {
         decoded = decode(buffer);
       } catch (error) {
-        this.connectionStats.totalErrors++;
         this.log("error", "Failed to decode WebSocket frame", {
           error: error instanceof Error ? error.message : String(error),
           byteLength: buffer.byteLength
@@ -3284,7 +3308,6 @@ var PHPSandbox = (() => {
       try {
         await this.handleRawMessage(decoded);
       } catch (error) {
-        this.connectionStats.totalErrors++;
         this.log("error", "Failed to process WebSocket frame", {
           error: error instanceof Error ? error.message : String(error),
           byteLength: buffer.byteLength
@@ -3297,6 +3320,19 @@ var PHPSandbox = (() => {
         });
       }
     }
+    async toArrayBuffer(data) {
+      if (data instanceof Blob) {
+        return data.arrayBuffer();
+      }
+      if (data instanceof ArrayBuffer) {
+        return data;
+      }
+      if (ArrayBuffer.isView(data)) {
+        const bytes = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+        return bytes.slice().buffer;
+      }
+      throw new Error("Unexpected message type: " + typeof data);
+    }
     async handleRawMessage(ev) {
       if (this.closed) {
         this.log("debug", "Ignoring message received after transport was closed");
@@ -3318,9 +3354,10 @@ var PHPSandbox = (() => {
           return;
         }
         if (event === "Events.BootError" /* BootError */) {
+          const errorData = data;
           const error = new NotebookUnavailableError(
-            data?.message || "Notebook is no longer available",
-            data || {}
+            errorData?.message || "Notebook is no longer available",
+            errorData || {}
           );
           this.log("error", "Boot error received", { data });
           this.terminate(error, 4e3, error.message);
@@ -3349,18 +3386,15 @@ var PHPSandbox = (() => {
         }
         await this.handleMessage(event, data, as);
       } catch (e) {
-        this.connectionStats.totalErrors++;
         if (e instanceof InvalidMessageError) {
           this.log("error", "Invalid message format", {
             error: e.message,
-            data: e.data,
-            totalErrors: this.connectionStats.totalErrors
+            data: e.data
           });
         } else {
           this.log("error", "Failed to parse message", {
             ev,
-            error: e instanceof Error ? e.message : String(e),
-            totalErrors: this.connectionStats.totalErrors
+            error: e instanceof Error ? e.message : String(e)
           });
         }
         this.eventEmitter.emit("transport.error", {
@@ -3374,7 +3408,7 @@ var PHPSandbox = (() => {
     async handleMessage(event, data, as) {
       if (event === "App.Actions.GetClientId" /* ClientId */) {
         this.clientId = data.id;
-        this.eventEmitter.emit(event, data.id);
+        this.eventEmitter.emit(event, this.clientId);
         return;
       }
       event && this.eventEmitter.emit(as || event, data);
@@ -3383,7 +3417,7 @@ var PHPSandbox = (() => {
       return this.eventEmitter.listen(event, listener);
     }
     onDidBootError(listener) {
-      this.eventEmitter.listen("transport.boot_error", (event) => {
+      return this.eventEmitter.listen("transport.boot_error", (event) => {
         listener(event.error);
       });
     }
@@ -3391,12 +3425,7 @@ var PHPSandbox = (() => {
       this.eventEmitter.removeListener(event, listener);
     }
     listenOnce(event, listener, context) {
-      this.eventEmitter.once(event, listener, context);
-      this.disposables.add(`once_${event}_${nanoid()}`, {
-        dispose: () => {
-          this.eventEmitter.removeListener(event, listener);
-        }
-      });
+      return this.eventEmitter.once(event, listener, context);
     }
     emit(event, ...data) {
       this.eventEmitter.emit(event, ...data);
@@ -3428,19 +3457,23 @@ var PHPSandbox = (() => {
       if (this.terminalError) {
         throw this.terminalError;
       }
-      this.clearOldQueuedMessages();
       const responseEvent = options.responseEvent || `${action}_${nanoid()}_response`;
       const errorEvent = `${responseEvent}_error`;
       let closeHandler;
+      let abortHandler;
       const removeListeners = () => {
         if (closeHandler) {
           this.rws.removeEventListener("close", closeHandler);
           this.rws.removeEventListener("error", closeHandler);
         }
+        if (abortHandler) {
+          options.abortSignal?.removeEventListener("abort", abortHandler);
+          abortHandler = void 0;
+        }
         this.eventEmitter.removeListener(responseEvent);
         this.eventEmitter.removeListener(errorEvent);
       };
-      const handler = async (resolve, reject) => {
+      const handler = (resolve, reject) => {
         if (this.terminalError) {
           reject(this.terminalError);
           return;
@@ -3448,48 +3481,28 @@ var PHPSandbox = (() => {
         const abortError = new DOMException("Request aborted", "AbortError");
         if (options.abortSignal?.aborted) {
           reject(abortError);
+          return;
         }
         if (options.abortSignal) {
-          options.abortSignal.addEventListener("abort", () => {
+          abortHandler = () => {
             reject(abortError);
-          });
+          };
+          options.abortSignal.addEventListener("abort", abortHandler, { once: true });
         }
-        if (!this.isConnected && !this.isClosed) {
-          this.log("debug", "Connection not available, queuing message", {
-            action
-          });
-          if (this.messageQueue.length >= this.MAX_QUEUE_SIZE) {
-            const oldestMessage = this.messageQueue.shift();
-            if (oldestMessage) {
-              oldestMessage.reject(new Error("Message queue full, oldest message dropped"));
-            }
-          }
-          this.messageQueue.push({
-            action,
-            data,
-            options,
-            resolve,
-            reject,
-            timestamp: Date.now()
-          });
+        if (!this.isConnected || this.isClosed) {
+          reject(new ConnectionFailedError(`Connection is not open while sending ${action}. Current status: ${this.status}`));
           return;
         }
-        const startTime = Date.now();
         this.listenOnce(responseEvent, (response) => {
-          const responseTime = Date.now() - startTime;
-          this.connectionStats.avgResponseTime = (this.connectionStats.avgResponseTime + responseTime) / 2;
-          this.connectionStats.totalMessages++;
           this.log("debug", "Message response received", {
-            action,
-            responseTime,
-            avgResponseTime: this.connectionStats.avgResponseTime
+            action
           });
           resolve(response);
         });
         this.listenOnce(errorEvent, (e) => {
-          this.connectionStats.totalErrors++;
           this.log("error", "Message error received", { action, error: e });
-          reject(new ErrorEvent(e.code, e.message, e));
+          const error = e;
+          reject(new ErrorEvent(error.code, error.message, error));
         });
         closeHandler = (_ev) => {
           if (_ev.code === 1008 && (_ev.reason || "").includes("rate limit")) {
@@ -3506,11 +3519,17 @@ var PHPSandbox = (() => {
           this.log("debug", "Message sent", { action, data });
         } catch (error) {
           this.log("error", "Failed to send message", { action, error });
-          throw error;
+          reject(error);
         }
       };
       const send = async () => {
+        if (options.abortSignal?.aborted) {
+          throw new DOMException("Request aborted", "AbortError");
+        }
         await __privateMethod(this, _Transport_instances, connect_fn).call(this);
+        if (options.abortSignal?.aborted) {
+          throw new DOMException("Request aborted", "AbortError");
+        }
         const promise = new Promise(handler).finally(removeListeners);
         if (!options.timeout) {
           return promise;
@@ -3522,7 +3541,8 @@ var PHPSandbox = (() => {
           throw error;
         }).finally(removeListeners);
       };
-      return this.sendWithRetry(async () => await send(), options.retries || 10);
+      const retries = options.retries === false ? 0 : options.retries ?? 0;
+      return this.sendWithRetry(async () => await send(), retries);
     }
     send(action, data = {}) {
       if (this.terminalError) {
@@ -3536,11 +3556,9 @@ var PHPSandbox = (() => {
       }
       try {
         this.rws.send(this.pack({ action, data }));
-        this.connectionStats.totalMessages++;
         this.log("debug", "One-way message sent", { action, data });
         return true;
       } catch (error) {
-        this.connectionStats.totalErrors++;
         this.log("error", "Failed to send one-way message", { action, error });
         return false;
       }
@@ -3548,7 +3566,7 @@ var PHPSandbox = (() => {
     pack(data) {
       return new Blob([encode(data)]);
     }
-    sendWithRetry(sender, retries = 10) {
+    sendWithRetry(sender, retries) {
       return retry(
         async (bail, attempt) => {
           try {
@@ -3571,8 +3589,7 @@ var PHPSandbox = (() => {
             }
             this.log("debug", "Retrying send operation", {
               attempt,
-              error: e instanceof Error ? e.message : String(e),
-              nextDelay: this.getBackoffDelay(attempt - 1)
+              error: e instanceof Error ? e.message : String(e)
             });
             throw e;
           }
@@ -3618,7 +3635,6 @@ var PHPSandbox = (() => {
     }
     disconnect() {
       if (this.closed) {
-        console.trace("Transport is already closed, cannot disconnect again");
         return;
       }
       this.close();
@@ -3639,15 +3655,6 @@ 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) => {
-        msg.reject(closeError);
-      });
-      this.messageQueue = [];
-      if (queuedCount > 0) {
-        this.log("debug", `Rejected ${queuedCount} queued messages due to connection close`);
-      }
       this.disposables.dispose();
       try {
         this.rws.close(code, reason);
@@ -3659,7 +3666,6 @@ var PHPSandbox = (() => {
       this.eventEmitter.emit("transport.closed", {
         code,
         reason,
-        metrics: this.getConnectionMetrics(),
         timestamp: Date.now()
       });
       this.eventEmitter.removeListener("*");
@@ -3668,250 +3674,23 @@ var PHPSandbox = (() => {
     }
     onDidConnect(listener) {
       this.rws.addEventListener("open", listener);
-      this.disposables.add("connect", {
+      const disposable = {
         dispose: () => {
           this.rws.removeEventListener("open", listener);
         }
-      });
+      };
+      this.disposables.add(`connect_${nanoid()}`, disposable);
+      return disposable;
     }
     onDidClose(listener) {
       this.rws.addEventListener("close", listener);
-      this.disposables.add("close", {
+      const disposable = {
         dispose: () => {
           this.rws.removeEventListener("close", listener);
         }
-      });
-    }
-    /**
-     * Setup connection health monitoring
-     */
-    setupConnectionHealthMonitoring() {
-      this.rws.addEventListener("open", () => {
-        this.connectionStats.connectTime = Date.now();
-        this.connectionStats.reconnectCount++;
-        this.log("info", "Connection established", {
-          reconnectCount: this.connectionStats.reconnectCount,
-          timeSinceStart: Date.now() - this.connectionStats.connectionStartTime
-        });
-        this.processMessageQueue();
-      });
-      this.rws.addEventListener("close", (event) => {
-        this.log("warn", "Connection closed", {
-          code: event.code,
-          reason: event.reason,
-          wasClean: event.wasClean
-        });
-        this.handleConnectionClose(event.code);
-      });
-      this.rws.addEventListener("error", (event) => {
-        this.connectionStats.totalErrors++;
-        const detail = describeWebSocketEvent(event);
-        this.log("error", "Connection error", {
-          error: detail,
-          rawError: event,
-          totalErrors: this.connectionStats.totalErrors
-        });
-      });
-    }
-    /**
-     * Handle different WebSocket close codes appropriately
-     */
-    handleConnectionClose(code) {
-      switch (code) {
-        case 1e3:
-          this.log("info", "Normal connection closure");
-          return "stop";
-        case 1001:
-          this.log("info", "Connection going away, will reconnect");
-          return "reconnect";
-        case 1006:
-          this.log("warn", "Abnormal connection closure, will retry");
-          return "retry";
-        case 1008:
-          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";
-      }
-    }
-    /**
-     * Process queued messages when connection is restored
-     */
-    processMessageQueue() {
-      if (this.messageQueue.length === 0) {
-        return;
-      }
-      this.log("debug", `Processing ${this.messageQueue.length} queued messages`);
-      const queue = [...this.messageQueue];
-      this.messageQueue = [];
-      for (const queuedMessage of queue) {
-        if (Date.now() - queuedMessage.timestamp > this.QUEUE_TIMEOUT) {
-          queuedMessage.reject(new Error("Queued message timed out"));
-          continue;
-        }
-        this.call(queuedMessage.action, queuedMessage.data, queuedMessage.options).then(queuedMessage.resolve).catch(queuedMessage.reject);
-      }
-    }
-    /**
-     * Clear old queued messages to prevent memory leaks
-     */
-    clearOldQueuedMessages() {
-      const now = Date.now();
-      const originalLength = this.messageQueue.length;
-      this.messageQueue = this.messageQueue.filter((msg) => {
-        const isExpired = now - msg.timestamp > this.QUEUE_TIMEOUT;
-        if (isExpired) {
-          msg.reject(new Error("Queued message expired"));
-        }
-        return !isExpired;
-      });
-      if (originalLength !== this.messageQueue.length) {
-        this.log("debug", `Cleared ${originalLength - this.messageQueue.length} expired messages`);
-      }
-    }
-    /**
-     * Calculate exponential backoff delay
-     */
-    getBackoffDelay(retryCount) {
-      const baseDelay = 1e3;
-      const maxDelay = 3e4;
-      const delay = Math.min(baseDelay * Math.pow(2, retryCount), maxDelay);
-      return delay + Math.random() * 1e3;
-    }
-    /**
-     * Get comprehensive connection metrics
-     */
-    getConnectionMetrics() {
-      const now = Date.now();
-      const connectionDuration = this.connectionStats.connectTime > 0 ? now - this.connectionStats.connectTime : 0;
-      return {
-        status: this.status,
-        clientId: this.clientId,
-        isConnected: this.isConnected,
-        isConnecting: this.isConnecting,
-        connectionStats: {
-          ...this.connectionStats,
-          connectionDuration,
-          uptime: now - this.connectionStats.connectionStartTime,
-          messagesPerSecond: connectionDuration > 0 ? (this.connectionStats.totalMessages / (connectionDuration / 1e3)).toFixed(2) : "0",
-          errorRate: this.connectionStats.totalMessages > 0 ? (this.connectionStats.totalErrors / this.connectionStats.totalMessages * 100).toFixed(2) + "%" : "0%",
-          timeSinceLastPing: this.connectionStats.lastPingTime > 0 ? now - this.connectionStats.lastPingTime : 0,
-          timeSinceLastPong: this.connectionStats.lastPongTime > 0 ? now - this.connectionStats.lastPongTime : 0
-        },
-        messageQueue: {
-          length: this.messageQueue.length,
-          maxSize: this.MAX_QUEUE_SIZE,
-          oldestMessageAge: this.messageQueue.length > 0 ? now - Math.min(...this.messageQueue.map((m) => m.timestamp)) : 0
-        },
-        config: {
-          pingInterval: this.PING_INTERVAL,
-          queueTimeout: this.QUEUE_TIMEOUT,
-          url: this.url.toString()
-        }
-      };
-    }
-    /**
-     * Get connection health status
-     */
-    getHealthStatus() {
-      const metrics = this.getConnectionMetrics();
-      const stats = metrics.connectionStats;
-      if (!this.isConnected || stats.timeSinceLastPong > this.PING_INTERVAL * 2 || Number.parseFloat(stats.errorRate) > 50) {
-        return "unhealthy";
-      }
-      if (stats.avgResponseTime > 5e3 || Number.parseFloat(stats.errorRate) > 10 || stats.timeSinceLastPong > this.PING_INTERVAL * 1.5) {
-        return "degraded";
-      }
-      return "healthy";
-    }
-    /**
-     * Reset connection statistics
-     */
-    resetStats() {
-      this.connectionStats = {
-        connectTime: Date.now(),
-        reconnectCount: 0,
-        lastPingTime: 0,
-        lastPongTime: 0,
-        avgResponseTime: 0,
-        totalMessages: 0,
-        totalErrors: 0,
-        connectionStartTime: Date.now()
       };
-      this.log("debug", "Connection statistics reset");
-    }
-    /**
-     * Run connection diagnostics
-     */
-    async runDiagnostics() {
-      const metrics = this.getConnectionMetrics();
-      const status = this.getHealthStatus();
-      const issues = [];
-      const recommendations = [];
-      if (!this.isConnected) {
-        issues.push("Connection is not established");
-        recommendations.push("Check network connectivity and server availability");
-      }
-      if (metrics.connectionStats.timeSinceLastPong > this.PING_INTERVAL * 2) {
-        issues.push("No pong received recently - connection may be stale");
-        recommendations.push("Consider forcing a reconnection");
-      }
-      if (Number.parseFloat(metrics.connectionStats.errorRate) > 10) {
-        issues.push(`High error rate: ${metrics.connectionStats.errorRate}`);
-        recommendations.push("Check server logs and network stability");
-      }
-      if (metrics.messageQueue.length > this.MAX_QUEUE_SIZE * 0.8) {
-        issues.push("Message queue is nearly full");
-        recommendations.push("Check connection stability and consider reducing message frequency");
-      }
-      if (metrics.connectionStats.avgResponseTime > 5e3) {
-        issues.push("High average response time");
-        recommendations.push("Check network latency and server performance");
-      }
-      this.log("info", "Connection diagnostics completed", {
-        status,
-        issueCount: issues.length,
-        recommendationCount: recommendations.length
-      });
-      return {
-        status,
-        metrics,
-        issues,
-        recommendations
-      };
-    }
-    /**
-     * Periodic maintenance - clean up old data, run health checks
-     */
-    startPeriodicMaintenance() {
-      this.disposables.add("maintenance", () => {
-        const maintenanceInterval = setInterval(
-          () => {
-            this.clearOldQueuedMessages();
-            if (this.options.debug) {
-              const health = this.getHealthStatus();
-              const metrics = this.getConnectionMetrics();
-              this.log("debug", "Periodic health check", {
-                health,
-                messageCount: metrics.connectionStats.totalMessages,
-                errorCount: metrics.connectionStats.totalErrors,
-                queueLength: metrics.messageQueue.length
-              });
-            }
-          },
-          5 * 60 * 1e3
-        );
-        return {
-          dispose: () => {
-            clearInterval(maintenanceInterval);
-          }
-        };
-      });
+      this.disposables.add(`close_${nanoid()}`, disposable);
+      return disposable;
     }
   };
   _Transport_instances = new WeakSet();
@@ -3961,7 +3740,7 @@ var PHPSandbox = (() => {
       };
       const closeHandler = (event) => {
         const detail = describeWebSocketEvent(event);
-        if ("code" in event && (event.code === 1008 || event.code === 4e3)) {
+        if (event.code === 1008 || event.code === 4e3) {
           cleanup();
           this.connectPromise = null;
           reject(new ConnectionFailedError(`WebSocket connection failed: ${detail}`, event));
@@ -3993,21 +3772,13 @@ var PHPSandbox = (() => {
     this.disposables.add("pingInterval", () => {
       const interval = setInterval(async () => {
         try {
-          this.connectionStats.lastPingTime = Date.now();
           this.log("debug", "Sending periodic ping");
-          const startTime = Date.now();
           await this.invoke("ping");
-          this.connectionStats.lastPongTime = Date.now();
-          const pingTime = this.connectionStats.lastPongTime - startTime;
-          this.log("debug", `Ping successful`, { pingTime });
+          this.log("debug", "Ping successful");
         } catch (error) {
           this.log("error", "Ping failed", {
             error: error instanceof Error ? error.message : String(error)
           });
-          if (Date.now() - this.connectionStats.lastPongTime > this.PING_INTERVAL * 3) {
-            this.log("warn", "Connection appears dead, forcing reconnection");
-            this.rws.reconnect();
-          }
         }
       }, this.PING_INTERVAL);
       return {
@@ -4020,6 +3791,10 @@ var PHPSandbox = (() => {
   };
 
   // node_modules/mitt/dist/mitt.mjs
+  var mitt_exports = {};
+  __export(mitt_exports, {
+    default: () => mitt_default
+  });
   function mitt_default(n) {
     return { all: n = n || /* @__PURE__ */ new Map(), on: function(t, e) {
       var i = n.get(t);
@@ -4038,11 +3813,20 @@ var PHPSandbox = (() => {
   }
 
   // src/events/index.ts
+  var createMitt = mitt_default ?? mitt_exports;
   function mittWithOnce(all) {
-    const inst = mitt_default(all);
+    const inst = createMitt(all);
     inst.once = (type, fn) => {
-      inst.on(type, fn);
-      inst.on(type, inst.off.bind(inst, type, fn));
+      const onceHandler = (event) => {
+        inst.off(type, onceHandler);
+        fn(event);
+      };
+      inst.on(type, onceHandler);
+      return {
+        dispose: () => {
+          inst.off(type, onceHandler);
+        }
+      };
     };
     return inst;
   }
@@ -4057,11 +3841,11 @@ var PHPSandbox = (() => {
       this.emitter.on(event, callback);
       return { dispose };
     }
-    emit(event, data) {
-      this.emitter.emit(event, data);
+    emit(event, ...data) {
+      this.emitter.emit(event, data.length > 1 ? data : data[0]);
     }
     once(event, callback) {
-      this.emitter.once(event, callback);
+      return this.emitter.once(event, callback);
     }
     static make() {
       return new _EventManager();
@@ -4561,11 +4345,11 @@ var PHPSandbox = (() => {
           });
         },
         {
-          retries: this.options.retry?.retries || 3,
-          minTimeout: this.options.retry?.minTimeout || 1e3,
-          maxTimeout: this.options.retry?.maxTimeout || 5e3,
-          factor: this.options.retry?.factor || 2,
-          randomize: this.options.retry?.randomize || true,
+          retries: this.options.retry?.retries ?? 3,
+          minTimeout: this.options.retry?.minTimeout ?? 1e3,
+          maxTimeout: this.options.retry?.maxTimeout ?? 5e3,
+          factor: this.options.retry?.factor ?? 2,
+          randomize: this.options.retry?.randomize ?? true,
           onRetry: (error, attempt) => {
             if (this.options.debug) {
               const errorMessage = error instanceof Error ? error.message : String(error);
@@ -4635,11 +4419,11 @@ var PHPSandbox = (() => {
           });
         },
         {
-          retries: this.options.retry?.retries || 3,
-          minTimeout: this.options.retry?.minTimeout || 1e3,
-          maxTimeout: this.options.retry?.maxTimeout || 5e3,
-          factor: this.options.retry?.factor || 2,
-          randomize: this.options.retry?.randomize || true,
+          retries: this.options.retry?.retries ?? 3,
+          minTimeout: this.options.retry?.minTimeout ?? 1e3,
+          maxTimeout: this.options.retry?.maxTimeout ?? 5e3,
+          factor: this.options.retry?.factor ?? 2,
+          randomize: this.options.retry?.randomize ?? true,
           onRetry: (error, attempt) => {
             if (this.options.debug) {
               const errorMessage = error instanceof Error ? error.message : String(error);
@@ -4700,7 +4484,7 @@ var PHPSandbox = (() => {
      * Listen for beacon events (one-time)
      */
     once(event, handler) {
-      this.eventEmitter.once(event, handler);
+      return this.eventEmitter.once(event, handler);
     }
     /**
      * Ping the beacon to check if it's responsive
@@ -4933,12 +4717,20 @@ var PHPSandbox = (() => {
       return instance;
     }
   };
+  function normalizeApiBaseUrl(url) {
+    const baseUrl = new URL(url);
+    const pathname = baseUrl.pathname.replace(/\/+$/, "");
+    baseUrl.pathname = pathname === "" || pathname === "/" ? "/v1/" : `${pathname}/`;
+    baseUrl.search = "";
+    baseUrl.hash = "";
+    return baseUrl.toString();
+  }
   var Client = class {
     constructor(token, url = "https://api.phpsandbox.io/v1", options = {}) {
       this.fetch = globalThis.fetch;
       this.notebook = new NotebookApi(this);
       this.options = Object.assign({ startClosed: true }, options);
-      this.baseUrl = url;
+      this.baseUrl = normalizeApiBaseUrl(url);
       if (options.fetch) {
         this.fetch = options.fetch;
       }
@@ -4952,17 +4744,17 @@ var PHPSandbox = (() => {
       return this.makeRequest("GET", path);
     }
     post(path, body) {
-      return this.makeRequest("POST", path, { body: body ? JSON.stringify(body) : void 0 });
+      return this.makeRequest("POST", path, { body: body === void 0 ? void 0 : JSON.stringify(body) });
     }
     delete(path) {
       return this.makeRequest("DELETE", path);
     }
     put(path, body) {
-      return this.makeRequest("PUT", path, { body: body ? JSON.stringify(body) : void 0 });
+      return this.makeRequest("PUT", path, { body: body === void 0 ? void 0 : JSON.stringify(body) });
     }
     async makeRequest(method, path, init) {
       const response = await this.fetch(
-        new Request(new URL(`v1/${path.replace(/^\//, "")}`, this.baseUrl), {
+        new Request(new URL(path.replace(/^\//, ""), this.baseUrl), {
           method,
           ...init,
           headers: this.headers
@@ -5081,7 +4873,7 @@ var PHPSandbox = (() => {
       this.log = new Log(this);
       this.repl = new Repl(this);
       this.container = new Container(this);
-      this.laravel = new Lravel(this);
+      this.laravel = new Laravel(this);
       this.shell = new Shell(this);
       this.git = new Git(this);
       this.services = new Services(this);
@@ -5139,24 +4931,12 @@ 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);
-      }
-      return new Promise((resolve, reject) => {
-        try {
-          this.socket.onDidConnect(() => resolve(this));
-          this.socket.onDidClose(() => reject(new Error("Connection closed")));
-          this.socket.onDidBootError((error) => reject(error));
-        } catch (e) {
-          reject(e);
-        }
-      });
+      return this.waitForSocketConnection({ rejectOnClose: true });
     }
     whenConnected() {
+      return this.waitForSocketConnection({ rejectOnClose: false });
+    }
+    waitForSocketConnection(options) {
       const terminalError = this.socket.getTerminalError();
       if (terminalError) {
         return Promise.reject(terminalError);
@@ -5165,11 +4945,30 @@ var PHPSandbox = (() => {
         return Promise.resolve(this);
       }
       return new Promise((resolve, reject) => {
+        const disposables = [];
+        let settled = false;
+        const cleanup = () => {
+          for (const disposable of disposables) {
+            disposable.dispose();
+          }
+          disposables.length = 0;
+        };
+        const settle = (callback) => {
+          if (settled) {
+            return;
+          }
+          settled = true;
+          cleanup();
+          callback();
+        };
         try {
-          this.socket.onDidConnect(() => resolve(this));
-          this.socket.onDidBootError((error) => reject(error));
+          disposables.push(this.socket.onDidConnect(() => settle(() => resolve(this))));
+          if (options.rejectOnClose) {
+            disposables.push(this.socket.onDidClose(() => settle(() => reject(new Error("Connection closed")))));
+          }
+          disposables.push(this.socket.onDidBootError((error) => settle(() => reject(error))));
         } catch (e) {
-          reject(e);
+          settle(() => reject(e));
         }
       });
     }
@@ -5349,4 +5148,3 @@ reconnecting-websocket/dist/reconnecting-websocket-mjs.js:
    * License MIT
    *)
 */
-//# sourceMappingURL=phpsandbox-sdk.iife.js.map