@calimero-network/mero-js 25.3.2 → 25.3.3

package/dist/index.cjs

@@ -3328,7 +3328,8 @@ var SseClient = class {
       return;
     }
     this.closed = false;
-    this.abortController = new AbortController();
+    const controller = new AbortController();
+    this.abortController = controller;
     try {
       const url2 = `${this.baseUrl}/sse`;
       const headers = {
@@ -3338,7 +3339,7 @@ var SseClient = class {
       const proofAttached = carriesProof(headers);
       const response = await this.fetchImpl(url2, {
         headers,
-        signal: this.abortController.signal,
+        signal: controller.signal,
         ...proofAttached && { redirect: "manual" }
       });
       if (proofAttached) refuseProofRedirect(response, url2);
@@ -3366,21 +3367,31 @@ var SseClient = class {
       if (!response.body) {
         throw new Error("SSE response has no body");
       }
-      this.readStream(response.body).catch((err) => {
-        if (this.closed) return;
+      this.readStream(response.body, controller).catch((err) => {
+        if (this.superseded(controller)) return;
         const error = err instanceof Error ? err : new Error(String(err));
         this.emit("error", error);
         this.scheduleReconnect();
       });
     } catch (err) {
-      if (this.closed) return;
+      if (this.superseded(controller)) return;
       const error = err instanceof Error ? err : new Error(String(err));
       this.emit("error", error);
       if (error instanceof AuthRevokedError) return;
       this.scheduleReconnect();
     }
   }
-  async readStream(body) {
+  /**
+   * Whether `controller`'s connection is no longer the one this client holds:
+   * closed, or replaced by a later connect. Its abort lands asynchronously,
+   * after a `close()` + `connect()` has already cleared `closed`, so `closed`
+   * alone cannot tell; reporting it, and reconnecting for it, would abort the
+   * live connection, whose own abort would do the same, without end.
+   */
+  superseded(controller) {
+    return this.closed || controller.signal.aborted || this.abortController !== controller;
+  }
+  async readStream(body, controller) {
     const reader = body.getReader();
     const decoder = new TextDecoder();
     let buffer = "";
@@ -3408,11 +3419,11 @@ var SseClient = class {
         }
       }
     } catch (err) {
-      if (this.closed) return;
+      if (this.superseded(controller)) return;
       const error = err instanceof Error ? err : new Error(String(err));
       this.emit("error", error);
     }
-    if (!this.closed) {
+    if (!this.superseded(controller)) {
       this.scheduleReconnect();
     }
   }