@unicitylabs/sphere-sdk 0.6.10-dev.7 → 0.6.11

package/dist/core/index.cjs

@@ -567,6 +567,18 @@ function connect(endpoint = DEFAULT_ENDPOINT) {
     return waitForConnection();
   }
   isConnecting = true;
+  if (ws) {
+    try {
+      ws.onopen = null;
+      ws.onclose = null;
+      ws.onerror = null;
+      ws.onmessage = null;
+      ws.close();
+    } catch {
+    }
+    ws = null;
+  }
+  const epoch = ++connectionEpoch;
   return new Promise((resolve, reject) => {
     let hasResolved = false;
     try {
@@ -578,6 +590,7 @@ function connect(endpoint = DEFAULT_ENDPOINT) {
       return;
     }
     ws.onopen = () => {
+      if (epoch !== connectionEpoch) return;
       isConnected = true;
       isConnecting = false;
       reconnectAttempts = 0;
@@ -591,6 +604,7 @@ function connect(endpoint = DEFAULT_ENDPOINT) {
       connectionCallbacks.length = 0;
     };
     ws.onclose = () => {
+      if (epoch !== connectionEpoch) return;
       isConnected = false;
       isBlockSubscribed = false;
       stopPingTimer();
@@ -599,16 +613,6 @@ function connect(endpoint = DEFAULT_ENDPOINT) {
         req.reject(new Error("WebSocket connection closed"));
       });
       Object.keys(pending).forEach((key) => delete pending[Number(key)]);
-      if (intentionalClose) {
-        intentionalClose = false;
-        isConnecting = false;
-        reconnectAttempts = 0;
-        if (!hasResolved) {
-          hasResolved = true;
-          reject(new Error("WebSocket connection closed intentionally"));
-        }
-        return;
-      }
       if (reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
         logger.error("L1", "Max reconnect attempts reached. Giving up.");
         isConnecting = false;
@@ -630,7 +634,8 @@ function connect(endpoint = DEFAULT_ENDPOINT) {
         "L1",
         `WebSocket closed unexpectedly. Reconnecting in ${delay}ms (attempt ${reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})...`
       );
-      setTimeout(() => {
+      reconnectTimer = setTimeout(() => {
+        reconnectTimer = null;
         connect(endpoint).then(() => {
           if (!hasResolved) {
             hasResolved = true;
@@ -777,8 +782,16 @@ async function getCurrentBlockHeight() {
 }
 function disconnect() {
   stopPingTimer();
+  if (reconnectTimer) {
+    clearTimeout(reconnectTimer);
+    reconnectTimer = null;
+  }
+  connectionEpoch++;
   if (ws) {
-    intentionalClose = true;
+    ws.onopen = null;
+    ws.onclose = null;
+    ws.onerror = null;
+    ws.onmessage = null;
     ws.close();
     ws = null;
   }
@@ -786,18 +799,21 @@ function disconnect() {
   isConnecting = false;
   reconnectAttempts = 0;
   isBlockSubscribed = false;
+  const disconnectError = new Error("WebSocket disconnected");
   Object.values(pending).forEach((req) => {
     if (req.timeoutId) clearTimeout(req.timeoutId);
+    req.reject(disconnectError);
   });
   Object.keys(pending).forEach((key) => delete pending[Number(key)]);
   connectionCallbacks.forEach((cb) => {
     if (cb.timeoutId) clearTimeout(cb.timeoutId);
+    cb.reject(disconnectError);
   });
   connectionCallbacks.length = 0;
   blockSubscribers.length = 0;
   lastBlockHeader = null;
 }
-var DEFAULT_ENDPOINT, ws, isConnected, isConnecting, requestId, intentionalClose, reconnectAttempts, isBlockSubscribed, lastBlockHeader, pingTimer, pending, blockSubscribers, connectionCallbacks, MAX_RECONNECT_ATTEMPTS, BASE_DELAY, MAX_DELAY, RPC_TIMEOUT, CONNECTION_TIMEOUT, PING_INTERVAL;
+var DEFAULT_ENDPOINT, ws, isConnected, isConnecting, requestId, reconnectAttempts, isBlockSubscribed, lastBlockHeader, pingTimer, reconnectTimer, connectionEpoch, pending, blockSubscribers, connectionCallbacks, MAX_RECONNECT_ATTEMPTS, BASE_DELAY, MAX_DELAY, RPC_TIMEOUT, CONNECTION_TIMEOUT, PING_INTERVAL;
 var init_network = __esm({
   "l1/network.ts"() {
     "use strict";
@@ -809,11 +825,12 @@ var init_network = __esm({
     isConnected = false;
     isConnecting = false;
     requestId = 0;
-    intentionalClose = false;
     reconnectAttempts = 0;
     isBlockSubscribed = false;
     lastBlockHeader = null;
     pingTimer = null;
+    reconnectTimer = null;
+    connectionEpoch = 0;
     pending = {};
     blockSubscribers = [];
     connectionCallbacks = [];
@@ -5242,9 +5259,7 @@ var L1PaymentsModule = class {
     }
   }
   destroy() {
-    if (isWebSocketConnected()) {
-      disconnect();
-    }
+    disconnect();
     this._initialized = false;
     this._identity = void 0;
     this._addresses = [];
@@ -5255,9 +5270,7 @@ var L1PaymentsModule = class {
    */
   disable() {
     this._disabled = true;
-    if (isWebSocketConnected()) {
-      disconnect();
-    }
+    disconnect();
   }
   /**
    * Re-enable this module. Connection will be established lazily on next operation.
@@ -15472,7 +15485,7 @@ var MarketModule = class {
     const MAX_ATTEMPTS = 10;
     let ws2 = null;
     let reconnectAttempts2 = 0;
-    let reconnectTimer = null;
+    let reconnectTimer2 = null;
     let destroyed = false;
     function connect2() {
       if (destroyed) return;
@@ -15504,14 +15517,14 @@ var MarketModule = class {
       const delay = Math.min(BASE_DELAY2 * Math.pow(2, reconnectAttempts2), MAX_DELAY2);
       reconnectAttempts2++;
       logger.debug("Market", `Feed WebSocket reconnecting in ${delay}ms (attempt ${reconnectAttempts2}/${MAX_ATTEMPTS})`);
-      reconnectTimer = setTimeout(connect2, delay);
+      reconnectTimer2 = setTimeout(connect2, delay);
     }
     connect2();
     return () => {
       destroyed = true;
-      if (reconnectTimer) {
-        clearTimeout(reconnectTimer);
-        reconnectTimer = null;
+      if (reconnectTimer2) {
+        clearTimeout(reconnectTimer2);
+        reconnectTimer2 = null;
       }
       ws2?.close();
       ws2 = null;
@@ -18312,7 +18325,7 @@ var Sphere = class _Sphere {
     if (!this._transport.discoverAddresses) {
       throw new SphereError("Transport provider does not support address discovery", "INVALID_CONFIG");
     }
-    const includeL1Scan = options.includeL1Scan ?? true;
+    const includeL1Scan = (options.includeL1Scan ?? true) && !!this._l1Config;
     const transportResult = await discoverAddressesImpl(
       (index) => {
         const addrInfo = this._deriveAddressInternal(index, false);