@hocuspocus/provider 1.0.0-alpha.36 → 1.0.0-alpha.39

package/dist/hocuspocus-provider.cjs

@@ -1620,9 +1620,14 @@ class MessageReceiver {
         // Apply update
         const syncMessageType = readSyncMessage(message.decoder, message.encoder, provider.document, provider);
         // Synced once we receive Step2
-        if (emitSynced && syncMessageType === messageYjsSyncStep2) {
+        if (emitSynced && (syncMessageType === messageYjsSyncStep2)) {
             provider.synced = true;
         }
+        if (syncMessageType === messageYjsUpdate || syncMessageType === messageYjsSyncStep2) {
+            if (provider.unsyncedChanges > 0) {
+                provider.unsyncedChanges -= 1;
+            }
+        }
     }
     applyAwarenessMessage(provider) {
         const { message } = this;
@@ -1808,6 +1813,7 @@ class HocuspocusProvider extends EventEmitter {
         this.shouldConnect = true;
         this.status = exports.WebSocketStatus.Disconnected;
         this.isSynced = false;
+        this.unsyncedChanges = 0;
         this.isAuthenticated = false;
         this.lastMessageReceived = 0;
         this.mux = createMutex();
@@ -1816,6 +1822,9 @@ class HocuspocusProvider extends EventEmitter {
             connectionChecker: null,
         };
         this.connectionAttempt = null;
+        this.boundConnect = this.connect.bind(this);
+        this.boundBeforeUnload = this.beforeUnload.bind(this);
+        this.boundBroadcastChannelSubscriber = this.broadcastChannelSubscriber.bind(this);
         this.setConfiguration(configuration);
         this.configuration.document = configuration.document ? configuration.document : new Y__namespace.Doc();
         this.configuration.awareness = configuration.awareness ? configuration.awareness : new Awareness(this.document);
@@ -1861,6 +1870,7 @@ class HocuspocusProvider extends EventEmitter {
         if (this.status === exports.WebSocketStatus.Connected) {
             return;
         }
+        this.unsyncedChanges = 0; // set to 0 in case we got reconnected
         this.shouldConnect = true;
         this.subscribeToBroadcastChannel();
         try {
@@ -1896,8 +1906,8 @@ class HocuspocusProvider extends EventEmitter {
             ws.onmessage = this.onMessage.bind(this);
             ws.onclose = this.onClose.bind(this);
             ws.onopen = this.onOpen.bind(this);
-            ws.onerror = () => {
-                reject();
+            ws.onerror = (err) => {
+                reject(err);
             };
             this.webSocket = ws;
             // Reset the status
@@ -1933,6 +1943,9 @@ class HocuspocusProvider extends EventEmitter {
     get awareness() {
         return this.configuration.awareness;
     }
+    get hasUnsyncedChanges() {
+        return this.unsyncedChanges > 0;
+    }
     checkConnection() {
         var _a;
         // Don’t check the connection when it’s not even established
@@ -1957,19 +1970,21 @@ class HocuspocusProvider extends EventEmitter {
         }
         this.send(SyncStepOneMessage, { document: this.document });
     }
+    beforeUnload() {
+        removeAwarenessStates(this.awareness, [this.document.clientID], 'window unload');
+    }
     registerEventListeners() {
         if (typeof window === 'undefined') {
             return;
         }
-        window.addEventListener('online', this.connect.bind(this));
-        window.addEventListener('beforeunload', () => {
-            removeAwarenessStates(this.awareness, [this.document.clientID], 'window unload');
-        });
+        window.addEventListener('online', this.boundConnect);
+        window.addEventListener('beforeunload', this.boundBeforeUnload);
     }
     documentUpdateHandler(update, origin) {
         if (origin === this) {
             return;
         }
+        this.unsyncedChanges += 1;
         this.send(UpdateMessage, { update }, true);
     }
     awarenessUpdateHandler({ added, updated, removed }, origin) {
@@ -2133,7 +2148,8 @@ class HocuspocusProvider extends EventEmitter {
         if (typeof window === 'undefined') {
             return;
         }
-        window.removeEventListener('online', this.connect.bind(this));
+        window.removeEventListener('online', this.boundConnect);
+        window.removeEventListener('beforeunload', this.boundBeforeUnload);
     }
     get broadcastChannel() {
         return `${this.serverUrl}/${this.configuration.name}`;
@@ -2148,7 +2164,7 @@ class HocuspocusProvider extends EventEmitter {
     }
     subscribeToBroadcastChannel() {
         if (!this.subscribedToBroadcastChannel) {
-            subscribe(this.broadcastChannel, this.broadcastChannelSubscriber.bind(this));
+            subscribe(this.broadcastChannel, this.boundBroadcastChannelSubscriber);
             this.subscribedToBroadcastChannel = true;
         }
         this.mux(() => {
@@ -2166,7 +2182,7 @@ class HocuspocusProvider extends EventEmitter {
             states: new Map(),
         }, true);
         if (this.subscribedToBroadcastChannel) {
-            unsubscribe(this.broadcastChannel, this.broadcastChannelSubscriber.bind(this));
+            unsubscribe(this.broadcastChannel, this.boundBroadcastChannelSubscriber);
             this.subscribedToBroadcastChannel = false;
         }
     }