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

package/dist/hocuspocus-provider.esm.js

@@ -1,6 +1,6 @@
 import * as Y from 'yjs';
 import { retry } from '@lifeomic/attempt';
-import { readAuthMessage, writeAuthentication, Unauthorized, Forbidden } from '@hocuspocus/common';
+import { readAuthMessage, writeAuthentication, awarenessStatesToArray, WsReadyStates, Unauthorized, Forbidden } from '@hocuspocus/common';
 
 /**
  * Utility module to work with key-value stores.
@@ -1724,15 +1724,6 @@ class UpdateMessage extends OutgoingMessage {
     }
 }
 
-var awarenessStatesToArray = (states) => {
-    return Array.from(states.entries()).map(([key, value]) => {
-        return {
-            clientId: key,
-            ...value,
-        };
-    });
-};
-
 var WebSocketStatus;
 (function (WebSocketStatus) {
     WebSocketStatus["Connecting"] = "connecting";
@@ -1900,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: 'connected' });
+        this.emit('connect');
+    }
+    stopConnectionAttempt() {
+        this.connectionAttempt = null;
     }
     rejectConnectionAttempt() {
         var _a;
@@ -2006,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') {
@@ -2019,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) {
@@ -2041,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);
@@ -2108,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);
@@ -2185,5 +2175,5 @@ class HocuspocusCloudProvider extends HocuspocusProvider {
     }
 }
 
-export { HocuspocusCloudProvider, HocuspocusProvider, MessageType, WebSocketStatus, awarenessStatesToArray };
+export { HocuspocusCloudProvider, HocuspocusProvider, MessageType, WebSocketStatus };
 //# sourceMappingURL=hocuspocus-provider.esm.js.map