@hocuspocus/provider - npm Package Compare versions

Comparing version 2.6.1 to 2.7.0

dist/packages/extension-database/src/Database.d.ts

@@ -11,3 +11,3 @@ import { Extension, onChangePayload, onLoadDocumentPayload, storePayload, fetchPayload } from '@hocuspocus/server';
      */
-    store: (data: storePayload) => void;
+    store: (data: storePayload) => Promise<void>;
 }
@@ -14,0 +14,0 @@ export declare class Database implements Extension {

dist/packages/provider/src/HocuspocusProvider.d.ts

@@ -94,3 +94,2 @@ import * as mutex from 'lib0/mutex';
     boundOnOpen: (event: Event) => Promise<void>;
-    boundOnMessage: (event: MessageEvent) => void;
     boundOnClose: (event: CloseEvent) => void;
@@ -97,0 +96,0 @@ boundOnStatus: ({ status }: onStatusParameters) => void;

dist/packages/provider/src/HocuspocusProviderWebsocket.d.ts

@@ -80,2 +80,6 @@ import * as mutex from 'lib0/mutex';
     quiet: boolean;
+    /**
+     * Map of attached providers keyed by documentName.
+     */
+    providerMap: Map<string, HocuspocusProvider>;
 }
@@ -82,0 +86,0 @@ export declare class HocuspocusProviderWebsocket extends EventEmitter {

dist/packages/provider/src/IncomingMessage.d.ts

@@ -9,2 +9,3 @@ import { Decoder } from 'lib0/decoding';
     constructor(data: any);
+    peekVarString(): string;
     readVarUint(): MessageType;
@@ -11,0 +12,0 @@ readVarString(): string;

dist/packages/server/src/DirectConnection.d.ts

@@ -13,3 +13,3 @@ import Document from './Document.js';
     transact(transaction: (document: Document) => void, transactionOrigin?: any): Promise<void>;
-    disconnect(): void;
+    disconnect(): Promise<void>;
 }

dist/packages/server/src/Document.d.ts

@@ -22,2 +22,3 @@ import WebSocket from 'ws';
     isLoading: boolean;
+    isDestroyed: boolean;
     /**
@@ -91,3 +92,4 @@ * Constructor.
     broadcastStateless(payload: string): void;
+    destroy(): void;
 }
 export default Document;

dist/packages/server/src/Hocuspocus.d.ts

@@ -85,3 +85,3 @@ /// <reference types="node" />
     createDocument(documentName: string, request: Partial<Pick<IncomingMessage, 'headers' | 'url'>>, socketId: string, connection: ConnectionConfiguration, context?: any): Promise<Document>;
-    storeDocumentHooks(document: Document, hookPayload: onStoreDocumentPayload): void;
+    storeDocumentHooks(document: Document, hookPayload: onStoreDocumentPayload): Promise<void>;
     /**
@@ -88,0 +88,0 @@ * Run the given hook on all configured extensions.

dist/packages/server/src/types.d.ts

@@ -134,2 +134,3 @@ /// <reference types="node" />
 export interface onAuthenticatePayload {
+    context: any;
     documentName: string;
@@ -136,0 +137,0 @@ instance: Hocuspocus;

package.json

 {
   "name": "@hocuspocus/provider",
-  "version": "2.6.1",
+  "version": "2.7.0",
   "description": "hocuspocus provider",
@@ -32,6 +32,6 @@ "homepage": "https://hocuspocus.dev",
   "dependencies": {
-    "@hocuspocus/common": "^2.6.1",
+    "@hocuspocus/common": "^2.7.0",
     "@lifeomic/attempt": "^3.0.2",
     "lib0": "^0.2.47",
-    "ws": "^7.5.9"
+    "ws": "^8.14.2"
   },
@@ -38,0 +38,0 @@ "peerDependencies": {

src/HocuspocusProvider.ts

@@ -195,4 +195,2 @@ import { awarenessStatesToArray } from '@hocuspocus/common'
 
-    this.configuration.websocketProvider.on('message', this.boundOnMessage)
-
     this.configuration.websocketProvider.on('close', this.boundOnClose)
@@ -238,4 +236,2 @@ this.configuration.websocketProvider.on('close', this.configuration.onClose)
 
-  boundOnMessage = this.onMessage.bind(this)
-
   boundOnClose = this.onClose.bind(this)
@@ -392,5 +388,13 @@
 
+    let token: string | null
+    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,
@@ -445,6 +449,2 @@ })
 
-    if (documentName !== this.configuration.name) {
-      return // message is meant for another provider
-    }
-
     message.writeVarString(documentName)
@@ -493,3 +493,2 @@
     this.configuration.websocketProvider.off('open', this.forwardOpen)
-    this.configuration.websocketProvider.off('message', this.boundOnMessage)
     this.configuration.websocketProvider.off('close', this.boundOnClose)
@@ -496,0 +495,0 @@ this.configuration.websocketProvider.off('close', this.configuration.onClose)

src/HocuspocusProviderWebsocket.ts

@@ -17,2 +17,3 @@ import {
 } from './types.js'
+import { IncomingMessage } from './IncomingMessage.js'
 
@@ -95,2 +96,7 @@ export type HocusPocusWebSocket = WebSocket & { identifier: string };
   quiet: boolean,
+
+  /**
+   * Map of attached providers keyed by documentName.
+   */
+  providerMap: Map<string, HocuspocusProvider>,
 }
@@ -139,2 +145,3 @@
     quiet: false,
+    providerMap: new Map(),
   }
@@ -221,2 +228,4 @@
   attach(provider: HocuspocusProvider) {
+    this.configuration.providerMap.set(provider.configuration.name, provider)
+
     if (this.status === WebSocketStatus.Disconnected && this.shouldConnect) {
@@ -236,3 +245,3 @@ this.connect()
   detach(provider: HocuspocusProvider) {
-    // tell the server to remove the listener
+    this.configuration.providerMap.delete(provider.configuration.name)
   }
@@ -376,2 +385,7 @@
     this.lastMessageReceived = time.getUnixTime()
+
+    const message = new IncomingMessage(event.data)
+    const documentName = message.peekVarString()
+
+    this.configuration.providerMap.get(documentName)?.onMessage(event)
   }
@@ -378,0 +392,0 @@

src/IncomingMessage.ts

 import {
   createDecoder,
+  peekVarString,
   readVarUint,
@@ -32,2 +33,6 @@ readVarUint8Array,
 
+  peekVarString(): string {
+    return peekVarString(this.decoder)
+  }
+
   readVarUint(): MessageType {
@@ -34,0 +39,0 @@ return readVarUint(this.decoder)

src/OutgoingMessages/QueryAwarenessMessage.ts

@@ -12,5 +12,2 @@ import * as encoding from 'lib0/encoding'
 
-    console.log('queryAwareness: writing string docName', args.documentName)
-    console.log(this.encoder.cpos)
-
     encoding.writeVarString(this.encoder, args.documentName!)
@@ -17,0 +14,0 @@ encoding.writeVarUint(this.encoder, this.type)

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

759012

increased by0.4%

Lines of code

8733

increased by0.74%

Dependency changes

• + Addedws@8.18.0(transitive)

• - Removedws@7.5.10(transitive)

• Updated@hocuspocus/common@^2.7.0

• Updatedws@^8.14.2