@phpsandbox/sdk 0.0.34 → 0.0.35

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

@@ -3222,6 +3222,12 @@ var NamedDisposable = class {
 };
 
 // src/socket/index.ts
+var ConnectionTimeoutError = class extends Error {
+  constructor(message = "WebSocket connection timeout") {
+    super(message);
+    this.name = "ConnectionTimeoutError";
+  }
+};
 var ConnectionFailedError = class extends Error {
   constructor(message, originalError) {
     super(message);
@@ -3280,6 +3286,7 @@ var Transport = class {
     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(), [], {
@@ -3309,6 +3316,9 @@ var Transport = class {
     if (options.connectionTimeout !== void 0 && (options.connectionTimeout < 100 || options.connectionTimeout > 3e4)) {
       throw new InvalidConfigurationError("connectionTimeout must be between 100ms and 30000ms");
     }
+    if (options.connectWaitTimeout !== void 0 && (options.connectWaitTimeout < 1e3 || options.connectWaitTimeout > 3e5)) {
+      throw new InvalidConfigurationError("connectWaitTimeout must be between 1000ms and 300000ms");
+    }
     if (options.maxRetries !== void 0 && (options.maxRetries < 0 || options.maxRetries > 100)) {
       throw new InvalidConfigurationError("maxRetries must be between 0 and 100");
     }
@@ -4043,34 +4053,50 @@ connect_fn = function() {
       __privateMethod(this, _Transport_instances, startPeriodicPing_fn).call(this);
       return;
     }
-    if (this.rws.readyState === 3) {
-      this.rws.reconnect();
-    }
     let timeoutId;
-    const openHandler = () => {
+    let errorCount = 0;
+    const cleanup = () => {
       this.rws.removeEventListener("open", openHandler);
       this.rws.removeEventListener("error", errorHandler);
+      this.rws.removeEventListener("close", closeHandler);
       clearTimeout(timeoutId);
+    };
+    const openHandler = () => {
+      cleanup();
       this.connectPromise = null;
       resolve();
       __privateMethod(this, _Transport_instances, startPeriodicPing_fn).call(this);
     };
     const errorHandler = (error) => {
-      this.rws.removeEventListener("open", openHandler);
-      this.rws.removeEventListener("error", errorHandler);
-      clearTimeout(timeoutId);
-      this.connectPromise = null;
-      const detail = describeWebSocketEvent(error);
-      reject(new ConnectionFailedError(`WebSocket connection failed: ${detail}`, error));
+      errorCount += 1;
+      this.log("warn", "WebSocket emitted an error while connecting; waiting for reconnect/open", {
+        errorCount,
+        error: describeWebSocketEvent(error)
+      });
+    };
+    const closeHandler = (event) => {
+      const detail = describeWebSocketEvent(event);
+      if ("code" in event && (event.code === 1008 || event.code === 4e3)) {
+        cleanup();
+        this.connectPromise = null;
+        reject(new ConnectionFailedError(`WebSocket connection failed: ${detail}`, event));
+        return;
+      }
+      this.log("warn", "WebSocket closed before opening; waiting for reconnect/open", {
+        error: detail
+      });
     };
-    timeoutId = setTimeout(() => {
-      this.rws.removeEventListener("open", openHandler);
-      this.rws.removeEventListener("error", errorHandler);
-      this.connectPromise = null;
-      reject(new Error("WebSocket connection timeout"));
-    }, 1e4);
     this.rws.addEventListener("open", openHandler);
     this.rws.addEventListener("error", errorHandler);
+    this.rws.addEventListener("close", closeHandler);
+    if (this.rws.readyState === 3) {
+      this.rws.reconnect();
+    }
+    timeoutId = setTimeout(() => {
+      cleanup();
+      this.connectPromise = null;
+      reject(new ConnectionTimeoutError(`WebSocket connection timeout after ${this.CONNECT_WAIT_TIMEOUT}ms`));
+    }, this.CONNECT_WAIT_TIMEOUT);
   });
   return this.connectPromise;
 };