@hocuspocus/provider 1.0.0-alpha.32 → 1.0.0-alpha.35

package/dist/hocuspocus-provider.esm.js

@@ -1,6 +1,6 @@
 import * as Y from 'yjs';
 import { retry } from '@lifeomic/attempt';
-import { readAuthMessage, writeAuthentication, awarenessStatesToArray, Unauthorized, Forbidden } from '@hocuspocus/common';
+import { readAuthMessage, writeAuthentication, awarenessStatesToArray, WsReadyStates, Unauthorized, Forbidden } from '@hocuspocus/common';
 
 /**
  * Utility module to work with key-value stores.
@@ -1528,7 +1528,13 @@ var MessageType;
     MessageType[MessageType["Awareness"] = 1] = "Awareness";
     MessageType[MessageType["Auth"] = 2] = "Auth";
     MessageType[MessageType["QueryAwareness"] = 3] = "QueryAwareness";
-})(MessageType || (MessageType = {}));
+})(MessageType || (MessageType = {}));
+var WebSocketStatus;
+(function (WebSocketStatus) {
+    WebSocketStatus["Connecting"] = "connecting";
+    WebSocketStatus["Connected"] = "connected";
+    WebSocketStatus["Disconnected"] = "disconnected";
+})(WebSocketStatus || (WebSocketStatus = {}));
 
 class OutgoingMessage {
     constructor() {
@@ -1724,12 +1730,6 @@ class UpdateMessage extends OutgoingMessage {
     }
 }
 
-var WebSocketStatus;
-(function (WebSocketStatus) {
-    WebSocketStatus["Connecting"] = "connecting";
-    WebSocketStatus["Connected"] = "connected";
-    WebSocketStatus["Disconnected"] = "disconnected";
-})(WebSocketStatus || (WebSocketStatus = {}));
 class HocuspocusProvider extends EventEmitter {
     constructor(configuration) {
         super();
@@ -1879,7 +1879,7 @@ class HocuspocusProvider extends EventEmitter {
             // Reset the status
             this.synced = false;
             this.status = WebSocketStatus.Connecting;
-            this.emit('status', { status: 'connecting' });
+            this.emit('status', { status: WebSocketStatus.Connecting });
             // Store resolve/reject for later use
             this.connectionAttempt = {
                 resolve,
@@ -1891,6 +1891,12 @@ class HocuspocusProvider extends EventEmitter {
         var _a;
         (_a = this.connectionAttempt) === null || _a === void 0 ? void 0 : _a.resolve();
         this.connectionAttempt = null;
+        this.status = WebSocketStatus.Connected;
+        this.emit('status', { status: WebSocketStatus.Connected });
+        this.emit('connect');
+    }
+    stopConnectionAttempt() {
+        this.connectionAttempt = null;
     }
     rejectConnectionAttempt() {
         var _a;
@@ -1997,11 +2003,15 @@ class HocuspocusProvider extends EventEmitter {
             //
         }
     }
-    onOpen(event) {
+    async onOpen(event) {
         this.emit('open', { event });
-        if (this.status !== WebSocketStatus.Connected) {
-            this.webSocketConnectionEstablished();
+        if (this.isAuthenticationRequired) {
+            this.send(AuthenticationMessage, {
+                token: await this.getToken(),
+            });
+            return;
         }
+        this.startSync();
     }
     async getToken() {
         if (typeof this.configuration.token === 'function') {
@@ -2010,18 +2020,6 @@ class HocuspocusProvider extends EventEmitter {
         }
         return this.configuration.token;
     }
-    async webSocketConnectionEstablished() {
-        this.status = WebSocketStatus.Connected;
-        this.emit('status', { status: 'connected' });
-        this.emit('connect');
-        if (this.isAuthenticationRequired) {
-            this.send(AuthenticationMessage, {
-                token: await this.getToken(),
-            });
-            return;
-        }
-        this.startSync();
-    }
     startSync() {
         this.send(SyncStepOneMessage, { document: this.document });
         if (this.awareness.getLocalState() !== null) {
@@ -2032,10 +2030,11 @@ class HocuspocusProvider extends EventEmitter {
         }
     }
     send(Message, args, broadcast = false) {
+        var _a;
         if (broadcast) {
             this.mux(() => { this.broadcast(Message, args); });
         }
-        if (this.status === WebSocketStatus.Connected) {
+        if (((_a = this.webSocket) === null || _a === void 0 ? void 0 : _a.readyState) === WsReadyStates.Open) {
             const messageSender = new MessageSender(Message, args);
             this.emit('outgoingMessage', { message: messageSender.message });
             messageSender.send(this.webSocket);
@@ -2057,7 +2056,7 @@ class HocuspocusProvider extends EventEmitter {
             // update awareness (all users except local left)
             removeAwarenessStates(this.awareness, Array.from(this.awareness.getStates().keys()).filter(client => client !== this.document.clientID), this);
             this.status = WebSocketStatus.Disconnected;
-            this.emit('status', { status: 'disconnected' });
+            this.emit('status', { status: WebSocketStatus.Disconnected });
             this.emit('disconnect', { event });
         }
         if (event.code === Unauthorized.code) {
@@ -2089,7 +2088,7 @@ class HocuspocusProvider extends EventEmitter {
         }
         // Let’s update the connection status.
         this.status = WebSocketStatus.Disconnected;
-        this.emit('status', { status: 'disconnected' });
+        this.emit('status', { status: WebSocketStatus.Disconnected });
         this.emit('disconnect', { event });
     }
     destroy() {
@@ -2099,10 +2098,10 @@ class HocuspocusProvider extends EventEmitter {
         }
         clearInterval(this.intervals.connectionChecker);
         removeAwarenessStates(this.awareness, [this.document.clientID], 'provider destroy');
-        // If there is still a connection attempt outstanding then we should resolve
+        // If there is still a connection attempt outstanding then we should stop
         // it before calling disconnect, otherwise it will be rejected in the onClose
         // handler and trigger a retry
-        this.resolveConnectionAttempt();
+        this.stopConnectionAttempt();
         this.disconnect();
         this.awareness.off('update', this.awarenessUpdateHandler);
         this.document.off('update', this.documentUpdateHandler);