@hocuspocus/provider 2.6.1 → 2.7.1

package/dist/hocuspocus-provider.esm.js

@@ -964,6 +964,20 @@ const _readVarStringNative = decoder =>
 /* c8 ignore next */
 const readVarString = utf8TextDecoder ? _readVarStringNative : _readVarStringPolyfill;
 
+/**
+ * Look ahead and read varString without incrementing position
+ *
+ * @function
+ * @param {Decoder} decoder
+ * @return {string}
+ */
+const peekVarString = decoder => {
+  const pos = decoder.pos;
+  const s = readVarString(decoder);
+  decoder.pos = pos;
+  return s
+};
+
 /**
  * Utility functions to work with buffers (Uint8Array).
  *
@@ -1610,6 +1624,38 @@ var WebSocketStatus;
     WebSocketStatus["Disconnected"] = "disconnected";
 })(WebSocketStatus || (WebSocketStatus = {}));
 
+class IncomingMessage {
+    constructor(data) {
+        this.data = data;
+        this.encoder = createEncoder();
+        this.decoder = createDecoder(new Uint8Array(this.data));
+    }
+    peekVarString() {
+        return peekVarString(this.decoder);
+    }
+    readVarUint() {
+        return readVarUint(this.decoder);
+    }
+    readVarString() {
+        return readVarString(this.decoder);
+    }
+    readVarUint8Array() {
+        return readVarUint8Array(this.decoder);
+    }
+    writeVarUint(type) {
+        return writeVarUint(this.encoder, type);
+    }
+    writeVarString(string) {
+        return writeVarString(this.encoder, string);
+    }
+    writeVarUint8Array(data) {
+        return writeVarUint8Array(this.encoder, data);
+    }
+    length() {
+        return length(this.encoder);
+    }
+}
+
 class HocuspocusProviderWebsocket extends EventEmitter {
     constructor(configuration) {
         super();
@@ -1652,6 +1698,7 @@ class HocuspocusProviderWebsocket extends EventEmitter {
             onAwarenessUpdate: () => null,
             onAwarenessChange: () => null,
             quiet: false,
+            providerMap: new Map(),
         };
         this.subscribedToBroadcastChannel = false;
         this.webSocket = null;
@@ -1704,6 +1751,7 @@ class HocuspocusProviderWebsocket extends EventEmitter {
         this.receivedOnStatusPayload = data;
     }
     attach(provider) {
+        this.configuration.providerMap.set(provider.configuration.name, provider);
         if (this.status === WebSocketStatus.Disconnected && this.shouldConnect) {
             this.connect();
         }
@@ -1715,7 +1763,7 @@ class HocuspocusProviderWebsocket extends EventEmitter {
         }
     }
     detach(provider) {
-        // tell the server to remove the listener
+        this.configuration.providerMap.delete(provider.configuration.name);
     }
     setConfiguration(configuration = {}) {
         this.configuration = { ...this.configuration, ...configuration };
@@ -1824,8 +1872,12 @@ class HocuspocusProviderWebsocket extends EventEmitter {
         });
     }
     onMessage(event) {
+        var _a;
         this.resolveConnectionAttempt();
         this.lastMessageReceived = getUnixTime();
+        const message = new IncomingMessage(event.data);
+        const documentName = message.peekVarString();
+        (_a = this.configuration.providerMap.get(documentName)) === null || _a === void 0 ? void 0 : _a.onMessage(event);
     }
     resolveConnectionAttempt() {
         if (this.connectionAttempt) {
@@ -1977,35 +2029,6 @@ class HocuspocusProviderWebsocket extends EventEmitter {
     }
 }
 
-class IncomingMessage {
-    constructor(data) {
-        this.data = data;
-        this.encoder = createEncoder();
-        this.decoder = createDecoder(new Uint8Array(this.data));
-    }
-    readVarUint() {
-        return readVarUint(this.decoder);
-    }
-    readVarString() {
-        return readVarString(this.decoder);
-    }
-    readVarUint8Array() {
-        return readVarUint8Array(this.decoder);
-    }
-    writeVarUint(type) {
-        return writeVarUint(this.encoder, type);
-    }
-    writeVarString(string) {
-        return writeVarString(this.encoder, string);
-    }
-    writeVarUint8Array(data) {
-        return writeVarUint8Array(this.encoder, data);
-    }
-    length() {
-        return length(this.encoder);
-    }
-}
-
 /**
  * @module sync-protocol
  */
@@ -2308,8 +2331,6 @@ class QueryAwarenessMessage extends OutgoingMessage {
         this.description = 'Queries awareness states';
     }
     get(args) {
-        console.log('queryAwareness: writing string docName', args.documentName);
-        console.log(this.encoder.cpos);
         writeVarString(this.encoder, args.documentName);
         writeVarUint(this.encoder, this.type);
         return this.encoder;
@@ -2431,7 +2452,6 @@ class HocuspocusProvider extends EventEmitter {
         this.boundBroadcastChannelSubscriber = this.broadcastChannelSubscriber.bind(this);
         this.boundPageUnload = this.pageUnload.bind(this);
         this.boundOnOpen = this.onOpen.bind(this);
-        this.boundOnMessage = this.onMessage.bind(this);
         this.boundOnClose = this.onClose.bind(this);
         this.boundOnStatus = this.onStatus.bind(this);
         this.forwardConnect = (e) => this.emit('connect', e);
@@ -2456,7 +2476,6 @@ class HocuspocusProvider extends EventEmitter {
         this.configuration.websocketProvider.on('connect', this.forwardConnect);
         this.configuration.websocketProvider.on('open', this.boundOnOpen);
         this.configuration.websocketProvider.on('open', this.forwardOpen);
-        this.configuration.websocketProvider.on('message', this.boundOnMessage);
         this.configuration.websocketProvider.on('close', this.boundOnClose);
         this.configuration.websocketProvider.on('close', this.configuration.onClose);
         this.configuration.websocketProvider.on('close', this.forwardClose);
@@ -2587,9 +2606,17 @@ class HocuspocusProvider extends EventEmitter {
     async onOpen(event) {
         this.isAuthenticated = false;
         this.emit('open', { event });
+        let token;
+        try {
+            token = await this.getToken();
+        }
+        catch (error) {
+            this.permissionDeniedHandler(`Failed to get token: ${error}`);
+            return;
+        }
         if (this.isAuthenticationRequired) {
             this.send(AuthenticationMessage, {
-                token: await this.getToken(),
+                token,
                 documentName: this.configuration.name,
             });
         }
@@ -2627,9 +2654,6 @@ class HocuspocusProvider extends EventEmitter {
     onMessage(event) {
         const message = new IncomingMessage(event.data);
         const documentName = message.readVarString();
-        if (documentName !== this.configuration.name) {
-            return; // message is meant for another provider
-        }
         message.writeVarString(documentName);
         this.emit('message', { event, message: new IncomingMessage(event.data) });
         new MessageReceiver(message).apply(this, true);
@@ -2659,7 +2683,6 @@ class HocuspocusProvider extends EventEmitter {
         this.configuration.websocketProvider.off('connect', this.forwardConnect);
         this.configuration.websocketProvider.off('open', this.boundOnOpen);
         this.configuration.websocketProvider.off('open', this.forwardOpen);
-        this.configuration.websocketProvider.off('message', this.boundOnMessage);
         this.configuration.websocketProvider.off('close', this.boundOnClose);
         this.configuration.websocketProvider.off('close', this.configuration.onClose);
         this.configuration.websocketProvider.off('close', this.forwardClose);