@hocuspocus/provider 1.0.0-alpha.19 → 1.0.0-alpha.23

package/dist/packages/extension-logger/src/Logger.d.ts

@@ -0,0 +1,68 @@
+import { Extension, onChangePayload, onConfigurePayload, onConnectPayload, onLoadDocumentPayload, onDestroyPayload, onDisconnectPayload, onListenPayload, onRequestPayload, onUpgradePayload } from '@hocuspocus/server';
+export interface LoggerConfiguration {
+    /**
+     * Prepend all logging message with a string.
+     *
+     * @deprecated
+     */
+    prefix: null | string;
+    /**
+     * Whether to log something for the `onLoadDocument` hook.
+     */
+    onLoadDocument: boolean;
+    /**
+     * Whether to log something for the `onChange` hook.
+     */
+    onChange: boolean;
+    /**
+     * Whether to log something for the `onConnect` hook.
+     */
+    onConnect: boolean;
+    /**
+     * Whether to log something for the `onDisconnect` hook.
+     */
+    onDisconnect: boolean;
+    /**
+     * Whether to log something for the `onUpgrade` hook.
+     */
+    onUpgrade: boolean;
+    /**
+     * Whether to log something for the `onRequest` hook.
+     */
+    onRequest: boolean;
+    /**
+     * Whether to log something for the `onListen` hook.
+     */
+    onListen: boolean;
+    /**
+     * Whether to log something for the `onDestroy` hook.
+     */
+    onDestroy: boolean;
+    /**
+     * Whether to log something for the `onConfigure` hook.
+     */
+    onConfigure: boolean;
+    /**
+     * A log function, if none is provided output will go to console
+     */
+    log: (...args: any[]) => void;
+}
+export declare class Logger implements Extension {
+    name: string | null;
+    configuration: LoggerConfiguration;
+    /**
+     * Constructor
+     */
+    constructor(configuration?: Partial<LoggerConfiguration>);
+    onLoadDocument(data: onLoadDocumentPayload): Promise<void>;
+    onChange(data: onChangePayload): Promise<void>;
+    onConnect(data: onConnectPayload): Promise<void>;
+    onDisconnect(data: onDisconnectPayload): Promise<void>;
+    onUpgrade(data: onUpgradePayload): Promise<void>;
+    onRequest(data: onRequestPayload): Promise<void>;
+    onListen(data: onListenPayload): Promise<void>;
+    onDestroy(data: onDestroyPayload): Promise<void>;
+    onConfigure(data: onConfigurePayload): Promise<void>;
+    private logRawText;
+    private log;
+}

package/dist/packages/extension-logger/src/index.d.ts

@@ -0,0 +1 @@
+export * from './Logger';

package/dist/packages/{monitor → extension-monitor}/src/Collector.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Configuration, onConnectPayload, onDisconnectPayload, onCreateDocumentPayload, onChangePayload } from '@hocuspocus/server';
+import { Configuration, onConnectPayload, onDisconnectPayload, onLoadDocumentPayload, onChangePayload } from '@hocuspocus/server';
 export declare class Collector {
     serverConfiguration: Partial<Configuration>;
     version: string;
@@ -30,7 +30,7 @@ export declare class Collector {
     connectionCount(): {
         count: string | number;
     };
-    createDocument(data: onCreateDocumentPayload): {
+    createDocument(data: onLoadDocumentPayload): {
         action: string;
         document: any;
         documentName: string;

package/dist/packages/{monitor → extension-monitor}/src/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Extension, onChangePayload, onConfigurePayload, onConnectPayload, onCreateDocumentPayload, onDisconnectPayload, onRequestPayload, onUpgradePayload } from '@hocuspocus/server';
+import { Extension, onChangePayload, onConfigurePayload, onConnectPayload, onLoadDocumentPayload, onDisconnectPayload, onRequestPayload, onUpgradePayload } from '@hocuspocus/server';
 import { IncomingMessage, ServerResponse } from 'http';
 import WebSocket from 'ws';
 import { Storage } from './Storage';
@@ -32,7 +32,7 @@ export declare class Monitor implements Extension {
     onUpgrade({ request, socket, head }: onUpgradePayload): Promise<void>;
     onConnect(data: onConnectPayload): Promise<void>;
     onDisconnect(data: onDisconnectPayload): Promise<void>;
-    onCreateDocument(data: onCreateDocumentPayload): Promise<void>;
+    onLoadDocument(data: onLoadDocumentPayload): Promise<void>;
     onChange(data: onChangePayload): Promise<void>;
     onConfigure(data: onConfigurePayload): Promise<void>;
 }

package/dist/packages/{redis → extension-redis}/src/Redis.d.ts

@@ -1,5 +1,5 @@
 import { RedisPersistence } from 'y-redis';
-import { Extension, onConnectPayload, onCreateDocumentPayload, onDisconnectPayload } from '@hocuspocus/server';
+import { Extension, onConnectPayload, onLoadDocumentPayload, onDisconnectPayload } from '@hocuspocus/server';
 export interface Configuration {
 }
 export declare class Redis implements Extension {
@@ -10,7 +10,7 @@ export declare class Redis implements Extension {
      * Constructor
      */
     constructor(configuration?: Partial<Configuration>);
-    onCreateDocument(data: onCreateDocumentPayload): Promise<import("yjs").Doc | undefined>;
+    onLoadDocument(data: onLoadDocumentPayload): Promise<import("yjs").Doc | undefined>;
     onConnect(data: onConnectPayload): Promise<void>;
     onDisconnect(data: onDisconnectPayload): Promise<void>;
 }

package/dist/packages/{rocksdb → extension-rocksdb}/src/index.d.ts

@@ -1,4 +1,4 @@
-import { Extension, onCreateDocumentPayload } from '@hocuspocus/server';
+import { Extension, onLoadDocumentPayload } from '@hocuspocus/server';
 import { LeveldbPersistence } from 'y-leveldb';
 export interface Configuration {
     options: object | undefined;
@@ -12,9 +12,9 @@ export declare class RocksDB implements Extension {
      */
     constructor(configuration?: Partial<Configuration>);
     /**
-     * onCreateDocument hook
+     * onLoadDocument hook
      */
-    onCreateDocument(data: onCreateDocumentPayload): Promise<any>;
+    onLoadDocument(data: onLoadDocumentPayload): Promise<any>;
     /**
      * store updates in y-leveldb persistence
      */

package/dist/packages/{webhook → extension-webhook}/src/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Extension, onChangePayload, onConnectPayload, onCreateDocumentPayload, onDisconnectPayload } from '@hocuspocus/server';
+import { Extension, onChangePayload, onConnectPayload, onLoadDocumentPayload, onDisconnectPayload } from '@hocuspocus/server';
 import { Doc } from 'yjs';
 import { Transformer } from '@hocuspocus/transformer';
 import { AxiosResponse } from 'axios';
@@ -48,9 +48,9 @@ export declare class Webhook implements Extension {
      */
     onChange(data: onChangePayload): Promise<void>;
     /**
-     * onCreateDocument hook
+     * onLoadDocument hook
      */
-    onCreateDocument(data: onCreateDocumentPayload): Promise<void>;
+    onLoadDocument(data: onLoadDocumentPayload): Promise<void>;
     /**
      * onConnect hook
      */

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

@@ -108,7 +108,7 @@ export interface HocuspocusProviderOptions {
 export declare class HocuspocusProvider extends EventEmitter {
     options: HocuspocusProviderOptions;
     subscribedToBroadcastChannel: boolean;
-    webSocket: any;
+    webSocket: WebSocket | null;
     shouldConnect: boolean;
     status: WebSocketStatus;
     isSynced: boolean;

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

@@ -4,6 +4,7 @@ import { IncomingMessage, Server as HTTPServer } from 'http';
 import { Configuration } from './types';
 import { MessageLogger } from './Debugger';
 export declare const defaultConfiguration: {
+    name: null;
     port: number;
     timeout: number;
 };

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

@@ -34,14 +34,27 @@ export interface Extension {
     onChange?(data: onChangePayload): Promise<any>;
     onConnect?(data: onConnectPayload): Promise<any>;
     onConfigure?(data: onConfigurePayload): Promise<any>;
-    onCreateDocument?(data: onCreateDocumentPayload): Promise<any>;
+    /**
+     * @deprecated onCreateDocument is deprecated, use onLoadDocument instead
+     */
+    onCreateDocument?(data: onLoadDocumentPayload): Promise<any>;
+    onLoadDocument?(data: onLoadDocumentPayload): Promise<any>;
     onDestroy?(data: onDestroyPayload): Promise<any>;
     onDisconnect?(data: onDisconnectPayload): Promise<any>;
     onListen?(data: onListenPayload): Promise<any>;
     onRequest?(data: onRequestPayload): Promise<any>;
     onUpgrade?(data: onUpgradePayload): Promise<any>;
 }
+export declare type Hook = 'onAuthenticate' | 'onChange' | 'onConnect' | 'onConfigure' | 
+/**
+ * @deprecated onCreateDocument is deprecated, use onLoadDocument instead
+ */
+'onCreateDocument' | 'onLoadDocument' | 'onDestroy' | 'onDisconnect' | 'onListen' | 'onRequest' | 'onUpgrade';
 export interface Configuration extends Extension {
+    /**
+     * A name for the instance, used for logging.
+     */
+    name: string | null;
     /**
      * A list of hocuspocus extenions.
      */
@@ -73,7 +86,7 @@ export interface onConnectPayload {
     socketId: string;
     connection: ConnectionConfig;
 }
-export interface onCreateDocumentPayload {
+export interface onLoadDocumentPayload {
     context: any;
     document: Document;
     documentName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hocuspocus/provider",
-  "version": "1.0.0-alpha.19",
+  "version": "1.0.0-alpha.23",
   "description": "hocuspocus provider",
   "homepage": "https://hocuspocus.dev",
   "keywords": [
@@ -15,8 +15,13 @@
   "module": "dist/hocuspocus-provider.esm.js",
   "types": "dist/packages/provider/src/index.d.ts",
   "exports": {
-    "import": "./dist/hocuspocus-provider.esm.js",
-    "require": "./dist/hocuspocus-provider.cjs"
+    "development": {
+      "import": "./src"
+    },
+    "default": {
+      "import": "./dist/hocuspocus-provider.esm.js",
+      "require": "./dist/hocuspocus-provider.cjs"
+    }
   },
   "files": [
     "src",
@@ -26,9 +31,9 @@
     "@lifeomic/attempt": "^3.0.0",
     "lib0": "^0.2.42",
     "y-protocols": "^1.0.5",
-    "yjs": "^13.5.8"
+    "yjs": "^13.5.0"
   },
-  "gitHead": "49a520f1b6be37139f5c7243a484dc413640869c",
+  "gitHead": "f85955a7cca23b23044b0579e96fc8d17c107a4c",
   "publishConfig": {
     "access": "public"
   }

package/src/HocuspocusProvider.ts

@@ -167,7 +167,7 @@ export class HocuspocusProvider extends EventEmitter {
 
   subscribedToBroadcastChannel = false
 
-  webSocket: any = null
+  webSocket: WebSocket | null = null
 
   shouldConnect = true
 
@@ -275,11 +275,11 @@ export class HocuspocusProvider extends EventEmitter {
           }
         },
       })
-    } catch (err: any) {
-      // If we aborted the connection attempt then don't throw an error
+    } catch (error: any) {
+      // If we aborted the connection attempt then don’t throw an error
       // ref: https://github.com/lifeomic/attempt/blob/master/src/index.ts#L136
-      if (err.code !== 'ATTEMPT_ABORTED') {
-        throw err
+      if (error && error.code !== 'ATTEMPT_ABORTED') {
+        throw error
       }
     }
   }
@@ -287,14 +287,15 @@ export class HocuspocusProvider extends EventEmitter {
   createWebSocketConnection() {
     return new Promise((resolve, reject) => {
       // Init the WebSocket connection
-      this.webSocket = new this.options.WebSocketPolyfill(this.url)
-      this.webSocket.binaryType = 'arraybuffer'
-      this.webSocket.onmessage = this.onMessage.bind(this)
-      this.webSocket.onclose = this.onClose.bind(this)
-      this.webSocket.onopen = this.onOpen.bind(this)
-      this.webSocket.onerror = () => {
+      const ws = new this.options.WebSocketPolyfill(this.url)
+      ws.binaryType = 'arraybuffer'
+      ws.onmessage = this.onMessage.bind(this)
+      ws.onclose = this.onClose.bind(this)
+      ws.onopen = this.onOpen.bind(this)
+      ws.onerror = () => {
         reject()
       }
+      this.webSocket = ws
 
       // Reset the status
       this.synced = false
@@ -345,7 +346,7 @@ export class HocuspocusProvider extends EventEmitter {
 
     // No message received in a long time, not even your own
     // Awareness updates, which are updated every 15 seconds.
-    this.webSocket.close()
+    this.webSocket?.close()
   }
 
   forceSync() {
@@ -474,8 +475,6 @@ export class HocuspocusProvider extends EventEmitter {
     }
 
     this.startSync()
-
-    this.resolveConnectionAttempt()
   }
 
   startSync() {
@@ -503,6 +502,8 @@ export class HocuspocusProvider extends EventEmitter {
   }
 
   onMessage(event: MessageEvent) {
+    this.resolveConnectionAttempt()
+
     this.lastMessageReceived = time.getUnixTime()
 
     const message = new IncomingMessage(event.data)

package/dist/packages/logger/src/index.d.ts

@@ -1,13 +0,0 @@
-import { Extension, onChangePayload, onConfigurePayload, onConnectPayload, onCreateDocumentPayload, onDestroyPayload, onDisconnectPayload, onListenPayload, onRequestPayload, onUpgradePayload } from '@hocuspocus/server';
-export declare class Logger implements Extension {
-    onCreateDocument(data: onCreateDocumentPayload): Promise<void>;
-    onChange(data: onChangePayload): Promise<void>;
-    onConnect(data: onConnectPayload): Promise<void>;
-    onDisconnect(data: onDisconnectPayload): Promise<void>;
-    onUpgrade(data: onUpgradePayload): Promise<void>;
-    onRequest(data: onRequestPayload): Promise<void>;
-    onListen(data: onListenPayload): Promise<void>;
-    onDestroy(data: onDestroyPayload): Promise<void>;
-    onConfigure(data: onConfigurePayload): Promise<void>;
-    private static log;
-}