@hocuspocus/provider 1.0.0-alpha.21 → 1.0.0-alpha.25

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

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

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

@@ -2,10 +2,53 @@ import { Extension, onChangePayload, onConfigurePayload, onConnectPayload, onLoa
 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
@@ -20,5 +63,6 @@ export declare class Logger implements Extension {
     onListen(data: onListenPayload): Promise<void>;
     onDestroy(data: onDestroyPayload): Promise<void>;
     onConfigure(data: onConfigurePayload): Promise<void>;
+    private logRawText;
     private log;
 }

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

@@ -1,9 +1,10 @@
 /// <reference types="node" />
 import WebSocket, { WebSocketServer } from 'ws';
 import { IncomingMessage, Server as HTTPServer } from 'http';
-import { Configuration } from './types';
+import { Configuration, Hook } from './types';
 import { MessageLogger } from './Debugger';
 export declare const defaultConfiguration: {
+    name: null;
     port: number;
     timeout: number;
 };
@@ -63,9 +64,8 @@ export declare class Hocuspocus {
     /**
      * Run the given hook on all configured extensions
      * Runs the given callback after each hook
-     * @private
      */
-    private hooks;
+    hooks(name: Hook, payload: any, callback?: Function | null): Promise<any>;
     /**
      * Get parameters by the given request
      * @private

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

@@ -45,7 +45,16 @@ export interface Extension {
     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.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hocuspocus/provider",
-  "version": "1.0.0-alpha.21",
+  "version": "1.0.0-alpha.25",
   "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"
+    "source": {
+      "import": "./src"
+    },
+    "default": {
+      "import": "./dist/hocuspocus-provider.esm.js",
+      "require": "./dist/hocuspocus-provider.cjs"
+    }
   },
   "files": [
     "src",
@@ -28,7 +33,7 @@
     "y-protocols": "^1.0.5",
     "yjs": "^13.5.0"
   },
-  "gitHead": "fa031748b345c53bd71eaeca2bccfcf29cbb36e8",
+  "gitHead": "cd788b6a315f608ef531524409abdce1e6790726",
   "publishConfig": {
     "access": "public"
   }

package/src/HocuspocusProvider.ts

@@ -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
       }
     }
   }
@@ -475,8 +475,6 @@ export class HocuspocusProvider extends EventEmitter {
     }
 
     this.startSync()
-
-    this.resolveConnectionAttempt()
   }
 
   startSync() {
@@ -504,6 +502,8 @@ export class HocuspocusProvider extends EventEmitter {
   }
 
   onMessage(event: MessageEvent) {
+    this.resolveConnectionAttempt()
+
     this.lastMessageReceived = time.getUnixTime()
 
     const message = new IncomingMessage(event.data)

package/src/MessageReceiver.ts

@@ -1,9 +1,9 @@
 import * as awarenessProtocol from 'y-protocols/awareness'
 import { readSyncMessage, messageYjsSyncStep2 } from 'y-protocols/sync'
+import { readAuthMessage } from '@hocuspocus/common'
 import { MessageType } from './types'
 import { HocuspocusProvider } from './HocuspocusProvider'
 import { IncomingMessage } from './IncomingMessage'
-import { readAuthMessage } from '../../../shared/protocols/auth'
 import { OutgoingMessage } from './OutgoingMessage'
 
 export class MessageReceiver {

package/src/OutgoingMessages/AuthenticationMessage.ts

@@ -1,5 +1,5 @@
 import { writeVarUint } from 'lib0/encoding'
-import { writeAuthentication } from '../../../../shared/protocols/auth'
+import { writeAuthentication } from '@hocuspocus/common'
 import { MessageType, OutgoingMessageArguments } from '../types'
 import { OutgoingMessage } from '../OutgoingMessage'