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

package/dist/packages/provider/src/HocuspocusProvider.d.ts

@@ -122,7 +122,7 @@ export declare class HocuspocusProvider extends EventEmitter {
     } | null;
     constructor(options?: Partial<HocuspocusProviderOptions>);
     setOptions(options?: Partial<HocuspocusProviderOptions>): void;
-    connect(): void;
+    connect(): Promise<void>;
     createWebSocketConnection(): Promise<unknown>;
     resolveConnectionAttempt(): void;
     rejectConnectionAttempt(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hocuspocus/provider",
-  "version": "1.0.0-alpha.17",
+  "version": "1.0.0-alpha.18",
   "description": "hocuspocus provider",
   "homepage": "https://hocuspocus.dev",
   "keywords": [
@@ -28,7 +28,7 @@
     "y-protocols": "^1.0.5",
     "yjs": "^13.5.8"
   },
-  "gitHead": "b2c6c6711d5de4dd352aaaf32e43e4f33d46068e",
+  "gitHead": "b3f043fa2f99dd35bd68940efcb0d5b86a165585",
   "publishConfig": {
     "access": "public"
   }

package/src/HocuspocusProvider.ts

@@ -251,7 +251,7 @@ export class HocuspocusProvider extends EventEmitter {
     this.options = { ...this.options, ...options }
   }
 
-  connect() {
+  async connect() {
     if (this.status === WebSocketStatus.Connected) {
       return
     }
@@ -259,21 +259,29 @@ export class HocuspocusProvider extends EventEmitter {
     this.shouldConnect = true
     this.subscribeToBroadcastChannel()
 
-    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 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: any) {
+      // 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() {
@@ -557,10 +565,15 @@ export class HocuspocusProvider extends EventEmitter {
 
     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)