@hocuspocus/provider 1.0.0-alpha.17 → 1.0.0-alpha.18

package/dist/hocuspocus-provider.cjs

@@ -1886,27 +1886,36 @@ class HocuspocusProvider extends EventEmitter {
     setOptions(options = {}) {
         this.options = { ...this.options, ...options };
     }
-    connect() {
+    async connect() {
         if (this.status === exports.WebSocketStatus.Connected) {
             return;
         }
         this.shouldConnect = true;
         this.subscribeToBroadcastChannel();
-        attempt.retry(this.createWebSocketConnection.bind(this), {
-            delay: this.options.delay,
-            initialDelay: this.options.initialDelay,
-            factor: this.options.factor,
-            maxAttempts: this.options.maxAttempts,
-            minDelay: this.options.minDelay,
-            maxDelay: this.options.maxDelay,
-            jitter: this.options.jitter,
-            timeout: this.options.timeout,
-            beforeAttempt: context => {
-                if (!this.shouldConnect) {
-                    context.abort();
-                }
-            },
-        });
+        try {
+            await attempt.retry(this.createWebSocketConnection.bind(this), {
+                delay: this.options.delay,
+                initialDelay: this.options.initialDelay,
+                factor: this.options.factor,
+                maxAttempts: this.options.maxAttempts,
+                minDelay: this.options.minDelay,
+                maxDelay: this.options.maxDelay,
+                jitter: this.options.jitter,
+                timeout: this.options.timeout,
+                beforeAttempt: context => {
+                    if (!this.shouldConnect) {
+                        context.abort();
+                    }
+                },
+            });
+        }
+        catch (err) {
+            // If we aborted the connection attempt then don't throw an error
+            // ref: https://github.com/lifeomic/attempt/blob/master/src/index.ts#L136
+            if (err.code !== 'ATTEMPT_ABORTED') {
+                throw err;
+            }
+        }
     }
     createWebSocketConnection() {
         return new Promise((resolve, reject) => {
@@ -2128,8 +2137,12 @@ class HocuspocusProvider extends EventEmitter {
             clearInterval(this.intervals.forceSync);
         }
         clearInterval(this.intervals.connectionChecker);
-        this.disconnect();
         removeAwarenessStates(this.awareness, [this.document.clientID], 'provider destroy');
+        // If there is still a connection attempt outstanding then we should resolve
+        // it before calling disconnect, otherwise it will be rejected in the onClose
+        // handler and trigger a retry
+        this.resolveConnectionAttempt();
+        this.disconnect();
         this.awareness.off('update', this.awarenessUpdateHandler);
         this.document.off('update', this.documentUpdateHandler);
         this.removeAllListeners();