resolve pending connect promises on unsubscribe to prevent throwing u…

…nnecessary errors
pocketbase · Jul 12, 2023 · 283499d · 283499d
1 parent 5579854
commit 283499d
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.15.3
+
+- Automatically resolve pending realtime connect `Promise`s in case `unsubscribe` is called before
+  `subscribe` is being able to complete ([pocketbase#2897](https://github.com/pocketbase/pocketbase/discussions/2897#discussioncomment-6423818)).
+
+
 ## 0.15.2
 
 - Replaced `new URL(...)` with manual url parsing as it is not fully supported in React Native ([pocketbase#2484](https://github.com/pocketbase/pocketbase/discussions/2484#discussioncomment-6114540)).

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.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.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.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.2",
+    "version": "0.15.3",
     "name": "pocketbase",
     "description": "PocketBase JavaScript SDK",
     "author": "Gani Georgiev",

diff --git a/src/services/RealtimeService.ts b/src/services/RealtimeService.ts
@@ -374,6 +374,7 @@ export default class RealtimeService extends BaseService {
             for (let p of this.pendingConnects) {
                 p.reject(new ClientResponseError(err));
             }
+            this.pendingConnects = [];
             this.disconnect();
             return;
         }
@@ -399,10 +400,13 @@ export default class RealtimeService extends BaseService {
         if (!fromReconnect) {
             this.reconnectAttempts = 0;
 
-            // reject any remaining connect promises
-            const err = new ClientResponseError(new Error("Realtime disconnected."));
+            // resolve any remaining connect promises
+            //
+            // this is done to avoid unnecessary throwing errors in case
+            // unsubscribe is called before the pending connect promises complete
+            // (see https://github.com/pocketbase/pocketbase/discussions/2897#discussioncomment-6423818)
             for (let p of this.pendingConnects) {
-                p.reject(err);
+                p.resolve();
             }
             this.pendingConnects = [];
         }