@hocuspocus/provider 2.2.0 → 2.2.2

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

@@ -72,6 +72,17 @@ export declare class HocuspocusProvider extends EventEmitter {
     intervals: any;
     isConnected: boolean;
     constructor(configuration: HocuspocusProviderConfiguration);
+    boundBroadcastChannelSubscriber: (data: ArrayBuffer) => void;
+    boundBeforeUnload: () => void;
+    boundOnOpen: (event: Event) => Promise<void>;
+    boundOnMessage: (event: MessageEvent) => void;
+    boundOnClose: (event: CloseEvent) => void;
+    boundOnStatus: ({ status }: onStatusParameters) => void;
+    forwardConnect: (e: any) => this;
+    forwardOpen: (e: any) => this;
+    forwardClose: (e: any) => this;
+    forwardDisconnect: (e: any) => this;
+    forwardDestroy: (e: any) => this;
     onStatus({ status }: onStatusParameters): void;
     setConfiguration(configuration?: Partial<HocuspocusProviderConfiguration>): void;
     get document(): Y.Doc;
@@ -79,7 +90,6 @@ export declare class HocuspocusProvider extends EventEmitter {
     get hasUnsyncedChanges(): boolean;
     updateUnsyncedChanges(unsyncedChanges?: number): void;
     forceSync(): void;
-    boundBeforeUnload: () => void;
     beforeUnload(): void;
     registerEventListeners(): void;
     sendStateless(payload: string): void;
@@ -101,7 +111,6 @@ export declare class HocuspocusProvider extends EventEmitter {
     permissionDeniedHandler(reason: string): void;
     authenticatedHandler(scope: string): void;
     get broadcastChannel(): string;
-    boundBroadcastChannelSubscriber: (data: ArrayBuffer) => void;
     broadcastChannelSubscriber(data: ArrayBuffer): void;
     subscribeToBroadcastChannel(): void;
     disconnectBroadcastChannel(): void;

package/dist/packages/provider/src/TiptapCollabProvider.d.ts

@@ -1,10 +1,12 @@
 import { HocuspocusProvider, HocuspocusProviderConfiguration } from './HocuspocusProvider.js';
-export type TiptapCollabProviderConfiguration = Required<Pick<HocuspocusProviderConfiguration, 'name'>> & Partial<HocuspocusProviderConfiguration> & AdditionalTiptapCollabProviderConfiguration;
+import { TiptapCollabProviderWebsocket } from './TiptapCollabProviderWebsocket.js';
+export type TiptapCollabProviderConfiguration = Required<Pick<HocuspocusProviderConfiguration, 'name'>> & Partial<HocuspocusProviderConfiguration> & (Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'websocketProvider'>> | Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'appId'>>);
 export interface AdditionalTiptapCollabProviderConfiguration {
     /**
      * A Hocuspocus Cloud App ID, get one here: https://collab.tiptap.dev
      */
-    appId: string;
+    appId?: string;
+    websocketProvider?: TiptapCollabProviderWebsocket;
 }
 export declare class TiptapCollabProvider extends HocuspocusProvider {
     constructor(configuration: TiptapCollabProviderConfiguration);

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

@@ -1,6 +1,6 @@
 import Document from './Document.js';
 import type { Hocuspocus } from './Hocuspocus.js';
-import type { DirectConnection as DirectConnectionInterface } from './types';
+import type { DirectConnection as DirectConnectionInterface } from './types.js';
 export declare class DirectConnection implements DirectConnectionInterface {
     document: Document | null;
     instance: Hocuspocus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hocuspocus/provider",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "hocuspocus provider",
   "homepage": "https://hocuspocus.dev",
   "keywords": [
@@ -29,7 +29,7 @@
     "dist"
   ],
   "dependencies": {
-    "@hocuspocus/common": "^2.2.0",
+    "@hocuspocus/common": "^2.2.2",
     "@lifeomic/attempt": "^3.0.2",
     "lib0": "^0.2.47",
     "ws": "^7.5.9"

package/src/HocuspocusProvider.ts

@@ -166,24 +166,24 @@ export class HocuspocusProvider extends EventEmitter {
     this.on('authenticationFailed', this.configuration.onAuthenticationFailed)
 
     this.configuration.websocketProvider.on('connect', this.configuration.onConnect)
-    this.configuration.websocketProvider.on('connect', (e: Event) => this.emit('connect', e))
+    this.configuration.websocketProvider.on('connect', this.forwardConnect)
 
-    this.configuration.websocketProvider.on('open', this.onOpen.bind(this))
-    this.configuration.websocketProvider.on('open', (e: Event) => this.emit('open', e))
+    this.configuration.websocketProvider.on('open', this.boundOnOpen)
+    this.configuration.websocketProvider.on('open', this.forwardOpen)
 
-    this.configuration.websocketProvider.on('message', this.onMessage.bind(this))
+    this.configuration.websocketProvider.on('message', this.boundOnMessage)
 
-    this.configuration.websocketProvider.on('close', this.onClose.bind(this))
+    this.configuration.websocketProvider.on('close', this.boundOnClose)
     this.configuration.websocketProvider.on('close', this.configuration.onClose)
-    this.configuration.websocketProvider.on('close', (e: Event) => this.emit('close', e))
+    this.configuration.websocketProvider.on('close', this.forwardClose)
 
-    this.configuration.websocketProvider.on('status', this.onStatus.bind(this))
+    this.configuration.websocketProvider.on('status', this.boundOnStatus)
 
     this.configuration.websocketProvider.on('disconnect', this.configuration.onDisconnect)
-    this.configuration.websocketProvider.on('disconnect', (e: Event) => this.emit('disconnect', e))
+    this.configuration.websocketProvider.on('disconnect', this.forwardDisconnect)
 
     this.configuration.websocketProvider.on('destroy', this.configuration.onDestroy)
-    this.configuration.websocketProvider.on('destroy', (e: Event) => this.emit('destroy', e))
+    this.configuration.websocketProvider.on('destroy', this.forwardDestroy)
 
     this.awareness.on('update', () => {
       this.emit('awarenessUpdate', { states: awarenessStatesToArray(this.awareness.getStates()) })
@@ -207,6 +207,28 @@ export class HocuspocusProvider extends EventEmitter {
     this.configuration.websocketProvider.attach(this)
   }
 
+  boundBroadcastChannelSubscriber = this.broadcastChannelSubscriber.bind(this)
+
+  boundBeforeUnload = this.beforeUnload.bind(this)
+
+  boundOnOpen = this.onOpen.bind(this)
+
+  boundOnMessage = this.onMessage.bind(this)
+
+  boundOnClose = this.onClose.bind(this)
+
+  boundOnStatus = this.onStatus.bind(this)
+
+  forwardConnect = (e: any) => this.emit('connect', e)
+
+  forwardOpen = (e: any) => this.emit('open', e)
+
+  forwardClose = (e: any) => this.emit('close', e)
+
+  forwardDisconnect = (e: any) => this.emit('disconnect', e)
+
+  forwardDestroy = (e: any) => this.emit('destroy', e)
+
   public onStatus({ status } : onStatusParameters) {
     this.status = status
 
@@ -248,8 +270,6 @@ export class HocuspocusProvider extends EventEmitter {
     this.send(SyncStepOneMessage, { document: this.document, documentName: this.configuration.name })
   }
 
-  boundBeforeUnload = this.beforeUnload.bind(this)
-
   beforeUnload() {
     removeAwarenessStates(this.awareness, [this.document.clientID], 'window unload')
   }
@@ -414,6 +434,20 @@ export class HocuspocusProvider extends EventEmitter {
 
     this.removeAllListeners()
 
+    this.configuration.websocketProvider.off('connect', this.configuration.onConnect)
+    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)
+    this.configuration.websocketProvider.off('status', this.boundOnStatus)
+    this.configuration.websocketProvider.off('disconnect', this.configuration.onDisconnect)
+    this.configuration.websocketProvider.off('disconnect', this.forwardDisconnect)
+    this.configuration.websocketProvider.off('destroy', this.configuration.onDestroy)
+    this.configuration.websocketProvider.off('destroy', this.forwardDestroy)
+
     this.send(CloseMessage, { documentName: this.configuration.name })
     this.isConnected = false
 
@@ -443,8 +477,6 @@ export class HocuspocusProvider extends EventEmitter {
     return `${this.configuration.name}`
   }
 
-  boundBroadcastChannelSubscriber = this.broadcastChannelSubscriber.bind(this)
-
   broadcastChannelSubscriber(data: ArrayBuffer) {
     this.mux(() => {
       const message = new IncomingMessage(data)

package/src/HocuspocusProviderWebsocket.ts

@@ -314,6 +314,8 @@ export class HocuspocusProviderWebsocket extends EventEmitter {
 
   onMessage(event: MessageEvent) {
     this.resolveConnectionAttempt()
+
+    this.lastMessageReceived = time.getUnixTime()
   }
 
   resolveConnectionAttempt() {

package/src/TiptapCollabProvider.ts

@@ -8,19 +8,22 @@ import { TiptapCollabProviderWebsocket } from './TiptapCollabProviderWebsocket.j
 export type TiptapCollabProviderConfiguration =
   Required<Pick<HocuspocusProviderConfiguration, 'name'>> &
   Partial<HocuspocusProviderConfiguration> &
-  AdditionalTiptapCollabProviderConfiguration
+  (Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'websocketProvider'>> |
+  Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'appId'>>)
 
 export interface AdditionalTiptapCollabProviderConfiguration {
   /**
    * A Hocuspocus Cloud App ID, get one here: https://collab.tiptap.dev
    */
-  appId: string,
+  appId?: string,
+
+  websocketProvider?: TiptapCollabProviderWebsocket
 }
 
 export class TiptapCollabProvider extends HocuspocusProvider {
   constructor(configuration: TiptapCollabProviderConfiguration) {
     if (!configuration.websocketProvider) {
-      configuration.websocketProvider = new TiptapCollabProviderWebsocket({ appId: configuration.appId })
+      configuration.websocketProvider = new TiptapCollabProviderWebsocket({ appId: (configuration as Required<Pick<AdditionalTiptapCollabProviderConfiguration, 'appId'>>).appId })
     }
 
     if (!configuration.token) {