@hocuspocus/provider 1.0.0-alpha.30 → 1.0.0-alpha.33

package/dist/hocuspocus-provider.cjs

@@ -1748,15 +1748,6 @@ class UpdateMessage extends OutgoingMessage {
     }
 }
 
-var awarenessStatesToArray = (states) => {
-    return Array.from(states.entries()).map(([key, value]) => {
-        return {
-            clientId: key,
-            ...value,
-        };
-    });
-};
-
 exports.WebSocketStatus = void 0;
 (function (WebSocketStatus) {
     WebSocketStatus["Connecting"] = "connecting";
@@ -1843,10 +1834,10 @@ class HocuspocusProvider extends EventEmitter {
         this.on('awarenessUpdate', this.configuration.onAwarenessUpdate);
         this.on('awarenessChange', this.configuration.onAwarenessChange);
         this.awareness.on('update', () => {
-            this.emit('awarenessUpdate', { states: awarenessStatesToArray(this.awareness.getStates()) });
+            this.emit('awarenessUpdate', { states: common.awarenessStatesToArray(this.awareness.getStates()) });
         });
         this.awareness.on('change', () => {
-            this.emit('awarenessChange', { states: awarenessStatesToArray(this.awareness.getStates()) });
+            this.emit('awarenessChange', { states: common.awarenessStatesToArray(this.awareness.getStates()) });
         });
         this.document.on('update', this.documentUpdateHandler.bind(this));
         this.awareness.on('update', this.awarenessUpdateHandler.bind(this));
@@ -1924,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: 'connected' });
+        this.emit('connect');
+    }
+    stopConnectionAttempt() {
+        this.connectionAttempt = null;
     }
     rejectConnectionAttempt() {
         var _a;
@@ -2030,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') {
@@ -2043,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) {
@@ -2065,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);
@@ -2132,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);
@@ -2211,5 +2201,4 @@ class HocuspocusCloudProvider extends HocuspocusProvider {
 
 exports.HocuspocusCloudProvider = HocuspocusCloudProvider;
 exports.HocuspocusProvider = HocuspocusProvider;
-exports.awarenessStatesToArray = awarenessStatesToArray;
 //# sourceMappingURL=hocuspocus-provider.cjs.map