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

package/dist/l1/index.js

@@ -538,11 +538,12 @@ var ws = null;
 var isConnected = false;
 var isConnecting = false;
 var requestId = 0;
-var intentionalClose = false;
 var reconnectAttempts = 0;
 var isBlockSubscribed = false;
 var lastBlockHeader = null;
 var pingTimer = null;
+var reconnectTimer = null;
+var connectionEpoch = 0;
 var pending = {};
 var blockSubscribers = [];
 var connectionCallbacks = [];
@@ -613,6 +614,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 {
@@ -624,6 +637,7 @@ function connect(endpoint = DEFAULT_ENDPOINT) {
       return;
     }
     ws.onopen = () => {
+      if (epoch !== connectionEpoch) return;
       isConnected = true;
       isConnecting = false;
       reconnectAttempts = 0;
@@ -637,6 +651,7 @@ function connect(endpoint = DEFAULT_ENDPOINT) {
       connectionCallbacks.length = 0;
     };
     ws.onclose = () => {
+      if (epoch !== connectionEpoch) return;
       isConnected = false;
       isBlockSubscribed = false;
       stopPingTimer();
@@ -645,16 +660,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;
@@ -676,7 +681,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;
@@ -823,8 +829,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;
   }
@@ -832,12 +846,15 @@ 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;