@hocuspocus/provider 3.0.6-rc.0 → 3.0.7-rc.0

package/dist/hocuspocus-provider.esm.js

@@ -1330,7 +1330,6 @@ class HocuspocusProviderWebsocket extends EventEmitter {
         };
         this.connectionAttempt = null;
         this.receivedOnOpenPayload = undefined;
-        this.receivedOnStatusPayload = undefined;
         this.closeTries = 0;
         this.setConfiguration(configuration);
         this.configuration.WebSocketPolyfill = configuration.WebSocketPolyfill
@@ -1342,7 +1341,6 @@ class HocuspocusProviderWebsocket extends EventEmitter {
         this.on('message', this.configuration.onMessage);
         this.on('outgoingMessage', this.configuration.onOutgoingMessage);
         this.on('status', this.configuration.onStatus);
-        this.on('status', this.onStatus.bind(this));
         this.on('disconnect', this.configuration.onDisconnect);
         this.on('close', this.configuration.onClose);
         this.on('destroy', this.configuration.onDestroy);
@@ -1363,15 +1361,12 @@ class HocuspocusProviderWebsocket extends EventEmitter {
         this.cancelWebsocketRetry = undefined;
         this.receivedOnOpenPayload = event;
     }
-    async onStatus(data) {
-        this.receivedOnStatusPayload = data;
-    }
     attach(provider) {
         this.configuration.providerMap.set(provider.configuration.name, provider);
         if (this.status === WebSocketStatus.Disconnected && this.shouldConnect) {
             this.connect();
         }
-        if (this.receivedOnOpenPayload) {
+        if (this.receivedOnOpenPayload && this.status === WebSocketStatus.Connected) {
             provider.onOpen(this.receivedOnOpenPayload);
         }
     }
@@ -1394,7 +1389,6 @@ class HocuspocusProviderWebsocket extends EventEmitter {
             this.cancelWebsocketRetry = undefined;
         }
         this.receivedOnOpenPayload = undefined;
-        this.receivedOnStatusPayload = undefined;
         this.shouldConnect = true;
         const abortableRetry = () => {
             let cancelAttempt = false;
@@ -2321,6 +2315,7 @@ class HocuspocusProvider extends EventEmitter {
             onAwarenessUpdate: () => null,
             onAwarenessChange: () => null,
             onStateless: () => null,
+            onUnsyncedChanges: () => null,
         };
         this.isSynced = false;
         this.unsyncedChanges = 0;
@@ -2328,7 +2323,7 @@ class HocuspocusProvider extends EventEmitter {
         this.authorizedScope = undefined;
         // @internal
         this.manageSocket = false;
-        this.isAttached = false;
+        this._isAttached = false;
         this.intervals = {
             forceSync: null,
         };
@@ -2338,7 +2333,6 @@ class HocuspocusProvider extends EventEmitter {
         this.boundOnOpen = this.onOpen.bind(this);
         this.boundOnClose = this.onClose.bind(this);
         this.forwardConnect = (e) => this.emit('connect', e);
-        // forwardOpen = (e: any) => this.emit('open', e)
         this.forwardClose = (e) => this.emit('close', e);
         this.forwardDisconnect = (e) => this.emit('disconnect', e);
         this.forwardDestroy = (e) => this.emit('destroy', e);
@@ -2353,6 +2347,7 @@ class HocuspocusProvider extends EventEmitter {
         this.on('awarenessUpdate', this.configuration.onAwarenessUpdate);
         this.on('awarenessChange', this.configuration.onAwarenessChange);
         this.on('stateless', this.configuration.onStateless);
+        this.on('unsyncedChanges', this.configuration.onUnsyncedChanges);
         this.on('authenticated', this.configuration.onAuthenticated);
         this.on('authenticationFailed', this.configuration.onAuthenticationFailed);
         (_a = this.awareness) === null || _a === void 0 ? void 0 : _a.on('update', () => {
@@ -2385,6 +2380,9 @@ class HocuspocusProvider extends EventEmitter {
     get document() {
         return this.configuration.document;
     }
+    get isAttached() {
+        return this._isAttached;
+    }
     get awareness() {
         return this.configuration.awareness;
     }
@@ -2393,11 +2391,11 @@ class HocuspocusProvider extends EventEmitter {
     }
     resetUnsyncedChanges() {
         this.unsyncedChanges = 1;
-        this.emit('unsyncedChanges', this.unsyncedChanges);
+        this.emit('unsyncedChanges', { number: this.unsyncedChanges });
     }
     incrementUnsyncedChanges() {
         this.unsyncedChanges += 1;
-        this.emit('unsyncedChanges', this.unsyncedChanges);
+        this.emit('unsyncedChanges', { number: this.unsyncedChanges });
     }
     decrementUnsyncedChanges() {
         if (this.unsyncedChanges > 0) {
@@ -2406,7 +2404,7 @@ class HocuspocusProvider extends EventEmitter {
         if (this.unsyncedChanges === 0) {
             this.synced = true;
         }
-        this.emit('unsyncedChanges', this.unsyncedChanges);
+        this.emit('unsyncedChanges', { number: this.unsyncedChanges });
     }
     forceSync() {
         this.resetUnsyncedChanges();
@@ -2464,9 +2462,15 @@ class HocuspocusProvider extends EventEmitter {
     }
     // not needed, but provides backward compatibility with e.g. lexical/yjs
     async connect() {
+        if (this.manageSocket) {
+            return this.configuration.websocketProvider.connect();
+        }
         console.warn('HocuspocusProvider::connect() is deprecated and does not do anything. Please connect/disconnect on the websocketProvider, or attach/deattach providers.');
     }
     disconnect() {
+        if (this.manageSocket) {
+            return this.configuration.websocketProvider.disconnect();
+        }
         console.warn('HocuspocusProvider::disconnect() is deprecated and does not do anything. Please connect/disconnect on the websocketProvider, or attach/deattach providers.');
     }
     async onOpen(event) {
@@ -2505,6 +2509,8 @@ class HocuspocusProvider extends EventEmitter {
         }
     }
     send(message, args) {
+        if (!this._isAttached)
+            return;
         const messageSender = new MessageSender(message, args);
         this.emit('outgoingMessage', { message: messageSender.message });
         messageSender.send(this.configuration.websocketProvider);
@@ -2557,10 +2563,10 @@ class HocuspocusProvider extends EventEmitter {
         this.configuration.websocketProvider.off('destroy', this.configuration.onDestroy);
         this.configuration.websocketProvider.off('destroy', this.forwardDestroy);
         this.configuration.websocketProvider.detach(this);
-        this.isAttached = false;
+        this._isAttached = false;
     }
     attach() {
-        if (this.isAttached)
+        if (this._isAttached)
             return;
         this.configuration.websocketProvider.on('connect', this.configuration.onConnect);
         this.configuration.websocketProvider.on('connect', this.forwardConnect);
@@ -2573,7 +2579,7 @@ class HocuspocusProvider extends EventEmitter {
         this.configuration.websocketProvider.on('destroy', this.configuration.onDestroy);
         this.configuration.websocketProvider.on('destroy', this.forwardDestroy);
         this.configuration.websocketProvider.attach(this);
-        this.isAttached = true;
+        this._isAttached = true;
     }
     permissionDeniedHandler(reason) {
         this.emit('authenticationFailed', { reason });
@@ -2582,7 +2588,7 @@ class HocuspocusProvider extends EventEmitter {
     authenticatedHandler(scope) {
         this.isAuthenticated = true;
         this.authorizedScope = scope;
-        this.emit('authenticated');
+        this.emit('authenticated', { scope });
     }
     setAwarenessField(key, value) {
         if (!this.awareness) {