[#204] cancel any pending submit requests on realtime disconnect

pocketbase · Jun 1, 2023 · 728c647 · 728c647
1 parent b263cec
commit 728c647
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.15.1
+
+- Cancel any pending submit requests on realtime disconnect ([#204](https://github.com/pocketbase/js-sdk/issues/204)).
+
+
 ## 0.15.0
 
 - Added `fields` to the optional query parameters for limiting the returned API fields (_available with PocketBase v0.16.0_).

diff --git a/dist/pocketbase.cjs.d.ts b/dist/pocketbase.cjs.d.ts
@@ -475,6 +475,7 @@ declare class RealtimeService extends BaseService {
     unsubscribeByTopicAndListener(topic: string, listener: EventListener): Promise<void>;
     private hasSubscriptionListeners;
     private submitSubscriptions;
+    private getSubscriptionsCancelKey;
     private getNonEmptySubscriptionTopics;
     private addAllSubscriptionListeners;
     private removeAllSubscriptionListeners;

diff --git a/dist/pocketbase.cjs.js b/dist/pocketbase.cjs.js
diff --git a/dist/pocketbase.cjs.js.map b/dist/pocketbase.cjs.js.map
diff --git a/dist/pocketbase.es.d.mts b/dist/pocketbase.es.d.mts
@@ -475,6 +475,7 @@ declare class RealtimeService extends BaseService {
     unsubscribeByTopicAndListener(topic: string, listener: EventListener): Promise<void>;
     private hasSubscriptionListeners;
     private submitSubscriptions;
+    private getSubscriptionsCancelKey;
     private getNonEmptySubscriptionTopics;
     private addAllSubscriptionListeners;
     private removeAllSubscriptionListeners;

diff --git a/dist/pocketbase.es.js b/dist/pocketbase.es.js
diff --git a/dist/pocketbase.es.js.map b/dist/pocketbase.es.js.map
diff --git a/dist/pocketbase.es.mjs b/dist/pocketbase.es.mjs
diff --git a/dist/pocketbase.es.mjs.map b/dist/pocketbase.es.mjs.map
diff --git a/dist/pocketbase.iife.d.ts b/dist/pocketbase.iife.d.ts
@@ -475,6 +475,7 @@ declare class RealtimeService extends BaseService {
     unsubscribeByTopicAndListener(topic: string, listener: EventListener): Promise<void>;
     private hasSubscriptionListeners;
     private submitSubscriptions;
+    private getSubscriptionsCancelKey;
     private getNonEmptySubscriptionTopics;
     private addAllSubscriptionListeners;
     private removeAllSubscriptionListeners;

diff --git a/dist/pocketbase.iife.js b/dist/pocketbase.iife.js
diff --git a/dist/pocketbase.iife.js.map b/dist/pocketbase.iife.js.map
diff --git a/dist/pocketbase.umd.d.ts b/dist/pocketbase.umd.d.ts
@@ -475,6 +475,7 @@ declare class RealtimeService extends BaseService {
     unsubscribeByTopicAndListener(topic: string, listener: EventListener): Promise<void>;
     private hasSubscriptionListeners;
     private submitSubscriptions;
+    private getSubscriptionsCancelKey;
     private getNonEmptySubscriptionTopics;
     private addAllSubscriptionListeners;
     private removeAllSubscriptionListeners;

diff --git a/dist/pocketbase.umd.js b/dist/pocketbase.umd.js
diff --git a/dist/pocketbase.umd.js.map b/dist/pocketbase.umd.js.map
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.15.0",
+    "version": "0.15.1",
     "name": "pocketbase",
     "description": "PocketBase JavaScript SDK",
     "author": "Gani Georgiev",

diff --git a/src/services/RealtimeService.ts b/src/services/RealtimeService.ts
@@ -227,7 +227,7 @@ export default class RealtimeService extends BaseService {
                 'subscriptions': this.lastSentTopics,
             },
             'params': {
-                '$cancelKey': "realtime_" + this.clientId,
+                '$cancelKey': this.getSubscriptionsCancelKey(),
             },
         }).catch((err) => {
             if (err?.isAbort) {
@@ -237,6 +237,10 @@ export default class RealtimeService extends BaseService {
         });
     }
 
+    private getSubscriptionsCancelKey(): string {
+        return "realtime_" + this.clientId;
+    }
+
     private getNonEmptySubscriptionTopics(): Array<string> {
         const result : Array<string> = [];
 
@@ -387,6 +391,7 @@ export default class RealtimeService extends BaseService {
         clearTimeout(this.connectTimeoutId);
         clearTimeout(this.reconnectTimeoutId);
         this.removeAllSubscriptionListeners();
+        this.client.cancelRequest(this.getSubscriptionsCancelKey());
         this.eventSource?.close();
         this.eventSource = null;
         this.clientId = "";