http-air 1.3.4 → 1.3.5

package/lib/client/events.d.ts

@@ -6,6 +6,7 @@ export declare class EventsClient {
     private response;
     private abortController;
     private status;
+    private connectionGen;
     private listenersMap;
     private subscribedSet;
     private subscribeBatch;

package/lib/client/events.js

@@ -54,6 +54,7 @@ class EventsClient {
     response;
     abortController;
     status = Status.Disconnected;
+    connectionGen = 0;
     listenersMap = new Map();
     subscribedSet = new Set();
     subscribeBatch;
@@ -103,12 +104,19 @@ class EventsClient {
         if (this.status !== Status.Disconnected)
             return;
         this.status = Status.Connecting;
-        return (0, p_retry_1.default)(() => this.performConnect(), {
+        const gen = ++this.connectionGen;
+        return (0, p_retry_1.default)(() => this.performConnect(gen), {
             retries: connectRetries,
-            onFailedAttempt: () => { this.status = Status.Disconnected; },
+            onFailedAttempt: () => {
+                if (this.connectionGen !== gen)
+                    throw new p_retry_1.AbortError(new Error('cancelled'));
+                this.status = Status.Disconnected;
+            },
         });
     }
-    async performConnect() {
+    async performConnect(gen) {
+        if (this.connectionGen !== gen)
+            return;
         if (this.status === Status.Connected)
             return;
         const [pResponse, abortController] = this.fetcher({ action: 'events-connect' });
@@ -178,6 +186,7 @@ class EventsClient {
         }
     }
     disconnect() {
+        this.connectionGen++;
         this.status = Status.Disconnected;
         this.abortController?.abort();
         this.listenersMap.forEach((_, name) => this.unsubscribeBatch.add(name));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "http-air",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "HTTP library for batched RPC calls and real-time server-push over a single endpoint.",
   "main": "index.js",
   "repository": "https://github.com/yosbelms/http-air",