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

package/dist/hocuspocus-provider.cjs

@@ -1552,7 +1552,13 @@ exports.MessageType = void 0;
     MessageType[MessageType["Awareness"] = 1] = "Awareness";
     MessageType[MessageType["Auth"] = 2] = "Auth";
     MessageType[MessageType["QueryAwareness"] = 3] = "QueryAwareness";
-})(exports.MessageType || (exports.MessageType = {}));
+})(exports.MessageType || (exports.MessageType = {}));
+exports.WebSocketStatus = void 0;
+(function (WebSocketStatus) {
+    WebSocketStatus["Connecting"] = "connecting";
+    WebSocketStatus["Connected"] = "connected";
+    WebSocketStatus["Disconnected"] = "disconnected";
+})(exports.WebSocketStatus || (exports.WebSocketStatus = {}));
 
 class OutgoingMessage {
     constructor() {
@@ -1748,12 +1754,6 @@ class UpdateMessage extends OutgoingMessage {
     }
 }
 
-exports.WebSocketStatus = void 0;
-(function (WebSocketStatus) {
-    WebSocketStatus["Connecting"] = "connecting";
-    WebSocketStatus["Connected"] = "connected";
-    WebSocketStatus["Disconnected"] = "disconnected";
-})(exports.WebSocketStatus || (exports.WebSocketStatus = {}));
 class HocuspocusProvider extends EventEmitter {
     constructor(configuration) {
         super();
@@ -1903,7 +1903,7 @@ class HocuspocusProvider extends EventEmitter {
             // Reset the status
             this.synced = false;
             this.status = exports.WebSocketStatus.Connecting;
-            this.emit('status', { status: 'connecting' });
+            this.emit('status', { status: exports.WebSocketStatus.Connecting });
             // Store resolve/reject for later use
             this.connectionAttempt = {
                 resolve,
@@ -1915,6 +1915,12 @@ class HocuspocusProvider extends EventEmitter {
         var _a;
         (_a = this.connectionAttempt) === null || _a === void 0 ? void 0 : _a.resolve();
         this.connectionAttempt = null;
+        this.status = exports.WebSocketStatus.Connected;
+        this.emit('status', { status: exports.WebSocketStatus.Connected });
+        this.emit('connect');
+    }
+    stopConnectionAttempt() {
+        this.connectionAttempt = null;
     }
     rejectConnectionAttempt() {
         var _a;
@@ -2021,11 +2027,15 @@ class HocuspocusProvider extends EventEmitter {
             //
         }
     }
-    onOpen(event) {
+    async onOpen(event) {
         this.emit('open', { event });
-        if (this.status !== exports.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') {
@@ -2034,18 +2044,6 @@ class HocuspocusProvider extends EventEmitter {
         }
         return this.configuration.token;
     }
-    async webSocketConnectionEstablished() {
-        this.status = exports.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) {
@@ -2056,10 +2054,11 @@ class HocuspocusProvider extends EventEmitter {
         }
     }
     send(Message, args, broadcast = false) {
+        var _a;
         if (broadcast) {
             this.mux(() => { this.broadcast(Message, args); });
         }
-        if (this.status === exports.WebSocketStatus.Connected) {
+        if (((_a = this.webSocket) === null || _a === void 0 ? void 0 : _a.readyState) === common.WsReadyStates.Open) {
             const messageSender = new MessageSender(Message, args);
             this.emit('outgoingMessage', { message: messageSender.message });
             messageSender.send(this.webSocket);
@@ -2081,7 +2080,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 = exports.WebSocketStatus.Disconnected;
-            this.emit('status', { status: 'disconnected' });
+            this.emit('status', { status: exports.WebSocketStatus.Disconnected });
             this.emit('disconnect', { event });
         }
         if (event.code === common.Unauthorized.code) {
@@ -2113,7 +2112,7 @@ class HocuspocusProvider extends EventEmitter {
         }
         // Let’s update the connection status.
         this.status = exports.WebSocketStatus.Disconnected;
-        this.emit('status', { status: 'disconnected' });
+        this.emit('status', { status: exports.WebSocketStatus.Disconnected });
         this.emit('disconnect', { event });
     }
     destroy() {
@@ -2123,10 +2122,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);