@hocuspocus/provider 3.4.6-rc.2 → 4.0.0-rc.1

package/dist/hocuspocus-provider.esm.js

@@ -1,8 +1,8 @@
-import { WsReadyStates, awarenessStatesToArray, readAuthMessage, writeAuthentication } from "@hocuspocus/common";
+import { WsReadyStates, awarenessStatesToArray, makeRoutingKey, parseRoutingKey, readAuthMessage, writeAuthentication } from "@hocuspocus/common";
 import * as Y from "yjs";
 import { retry } from "@lifeomic/attempt";
 
-//#region node_modules/lib0/math.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/math.js
 /**
 * Common Math expressions.
 *
@@ -26,7 +26,7 @@ const max = (a, b) => a > b ? a : b;
 const isNaN$1 = Number.isNaN;
 
 //#endregion
-//#region node_modules/lib0/binary.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/binary.js
 const BIT7 = 64;
 const BIT8 = 128;
 const BIT18 = 1 << 17;
@@ -70,7 +70,7 @@ const BITS31 = 2147483647;
 const BITS32 = 4294967295;
 
 //#endregion
-//#region node_modules/lib0/number.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/number.js
 /**
 * Utility helpers for working with numbers.
 *
@@ -87,7 +87,7 @@ const isNaN = Number.isNaN;
 const parseInt = Number.parseInt;
 
 //#endregion
-//#region node_modules/lib0/set.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/set.js
 /**
 * Utility module to work with sets.
 *
@@ -96,7 +96,7 @@ const parseInt = Number.parseInt;
 const create$2 = () => /* @__PURE__ */ new Set();
 
 //#endregion
-//#region node_modules/lib0/array.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/array.js
 /**
 * Transforms something array-like to an actual Array.
 *
@@ -109,7 +109,7 @@ const from = Array.from;
 const isArray$1 = Array.isArray;
 
 //#endregion
-//#region node_modules/lib0/string.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/string.js
 /**
 * Utility module to work with strings.
 *
@@ -124,7 +124,7 @@ const fromCodePoint = String.fromCodePoint;
 const MAX_UTF16_CHARACTER = fromCharCode(65535);
 /**
 * @param {string} str
-* @return {Uint8Array}
+* @return {Uint8Array<ArrayBuffer>}
 */
 const _encodeUtf8Polyfill = (str) => {
 	const encodedString = unescape(encodeURIComponent(str));
@@ -137,7 +137,7 @@ const _encodeUtf8Polyfill = (str) => {
 const utf8TextEncoder = typeof TextEncoder !== "undefined" ? new TextEncoder() : null;
 /**
 * @param {string} str
-* @return {Uint8Array}
+* @return {Uint8Array<ArrayBuffer>}
 */
 const _encodeUtf8Native = (str) => utf8TextEncoder.encode(str);
 /**
@@ -157,7 +157,7 @@ if (utf8TextDecoder && utf8TextDecoder.decode(new Uint8Array()).length === 1)
 utf8TextDecoder = null;
 
 //#endregion
-//#region node_modules/lib0/encoding.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/encoding.js
 /**
 * Efficient schema-less binary encoding with support for variable length encoding.
 *
@@ -210,7 +210,7 @@ const createEncoder = () => new Encoder();
 * @param {Encoder} encoder
 * @return {number}
 */
-const length$1 = (encoder) => {
+const length = (encoder) => {
 	let len = encoder.cpos;
 	for (let i = 0; i < encoder.bufs.length; i++) len += encoder.bufs[i].length;
 	return len;
@@ -220,10 +220,10 @@ const length$1 = (encoder) => {
 *
 * @function
 * @param {Encoder} encoder
-* @return {Uint8Array} The created ArrayBuffer.
+* @return {Uint8Array<ArrayBuffer>} The created ArrayBuffer.
 */
 const toUint8Array = (encoder) => {
-	const uint8arr = new Uint8Array(length$1(encoder));
+	const uint8arr = new Uint8Array(length(encoder));
 	let curPos = 0;
 	for (let i = 0; i < encoder.bufs.length; i++) {
 		const d = encoder.bufs[i];
@@ -339,7 +339,7 @@ const writeVarUint8Array = (encoder, uint8Array) => {
 };
 
 //#endregion
-//#region node_modules/lib0/error.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/error.js
 /**
 * Error helpers.
 *
@@ -353,7 +353,7 @@ const writeVarUint8Array = (encoder, uint8Array) => {
 const create$1 = (s) => new Error(s);
 
 //#endregion
-//#region node_modules/lib0/decoding.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/decoding.js
 /**
 * Efficient schema-less binary decoding with support for variable length encoding.
 *
@@ -385,16 +385,17 @@ const errorUnexpectedEndOfArray = create$1("Unexpected end of array");
 const errorIntegerOutOfRange = create$1("Integer out of Range");
 /**
 * A Decoder handles the decoding of an Uint8Array.
+* @template {ArrayBufferLike} [Buf=ArrayBufferLike]
 */
 var Decoder = class {
 	/**
-	* @param {Uint8Array} uint8Array Binary data to decode
+	* @param {Uint8Array<Buf>} uint8Array Binary data to decode
 	*/
 	constructor(uint8Array) {
 		/**
 		* Decoding target.
 		*
-		* @type {Uint8Array}
+		* @type {Uint8Array<Buf>}
 		*/
 		this.arr = uint8Array;
 		/**
@@ -407,8 +408,9 @@ var Decoder = class {
 };
 /**
 * @function
-* @param {Uint8Array} uint8Array
-* @return {Decoder}
+* @template {ArrayBufferLike} Buf
+* @param {Uint8Array<Buf>} uint8Array
+* @return {Decoder<Buf>}
 */
 const createDecoder = (uint8Array) => new Decoder(uint8Array);
 /**
@@ -418,9 +420,10 @@ const createDecoder = (uint8Array) => new Decoder(uint8Array);
 *            Use `buffer.copyUint8Array` to copy the result into a new Uint8Array.
 *
 * @function
-* @param {Decoder} decoder The decoder instance
+* @template {ArrayBufferLike} Buf
+* @param {Decoder<Buf>} decoder The decoder instance
 * @param {number} len The length of bytes to read
-* @return {Uint8Array}
+* @return {Uint8Array<Buf>}
 */
 const readUint8Array = (decoder, len) => {
 	const view = new Uint8Array(decoder.arr.buffer, decoder.pos + decoder.arr.byteOffset, len);
@@ -434,8 +437,9 @@ const readUint8Array = (decoder, len) => {
 *            Use `buffer.copyUint8Array` to copy the result into a new Uint8Array.
 *
 * @function
-* @param {Decoder} decoder
-* @return {Uint8Array}
+* @template {ArrayBufferLike} Buf
+* @param {Decoder<Buf>} decoder
+* @return {Uint8Array<Buf>}
 */
 const readVarUint8Array = (decoder) => readUint8Array(decoder, readVarUint(decoder));
 /**
@@ -560,7 +564,7 @@ const peekVarString = (decoder) => {
 };
 
 //#endregion
-//#region node_modules/lib0/time.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/time.js
 /**
 * Return current unix time.
 *
@@ -569,13 +573,18 @@ const peekVarString = (decoder) => {
 const getUnixTime = Date.now;
 
 //#endregion
-//#region node_modules/lib0/map.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/map.js
 /**
 * Utility module to work with key-value stores.
 *
 * @module map
 */
 /**
+* @template K
+* @template V
+* @typedef {Map<K,V>} GlobalMap
+*/
+/**
 * Creates a new Map instance.
 *
 * @function
@@ -607,7 +616,7 @@ const setIfUndefined = (map, key, createT) => {
 };
 
 //#endregion
-//#region node_modules/lib0/observable.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/observable.js
 /**
 * Observable class prototype.
 *
@@ -679,41 +688,36 @@ var Observable = class {
 /* c8 ignore end */
 
 //#endregion
-//#region node_modules/lib0/object.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/trait/equality.js
+const EqualityTraitSymbol = Symbol("Equality");
+
+//#endregion
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/object.js
 /**
 * @param {Object<string,any>} obj
 */
 const keys = Object.keys;
 /**
-* @deprecated use object.size instead
 * @param {Object<string,any>} obj
 * @return {number}
 */
-const length = (obj) => keys(obj).length;
+const size = (obj) => keys(obj).length;
 /**
 * Calls `Object.prototype.hasOwnProperty`.
 *
 * @param {any} obj
-* @param {string|symbol} key
+* @param {string|number|symbol} key
 * @return {boolean}
 */
 const hasProperty = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
 
 //#endregion
-//#region node_modules/lib0/function.js
+//#region node_modules/.pnpm/lib0@0.2.117/node_modules/lib0/function.js
 /**
 * Common functions and function call helpers.
 *
 * @module function
 */
-/**
-* @template T
-*
-* @param {T} a
-* @param {T} b
-* @return {boolean}
-*/
-const equalityStrict = (a, b) => a === b;
 /* c8 ignore start */
 /**
 * @param {any} a
@@ -721,9 +725,9 @@ const equalityStrict = (a, b) => a === b;
 * @return {boolean}
 */
 const equalityDeep = (a, b) => {
-	if (a == null || b == null) return equalityStrict(a, b);
-	if (a.constructor !== b.constructor) return false;
 	if (a === b) return true;
+	if (a == null || b == null || a.constructor !== b.constructor && (a.constructor || Object) !== (b.constructor || Object)) return false;
+	if (a[EqualityTraitSymbol] != null) return a[EqualityTraitSymbol](b);
 	switch (a.constructor) {
 		case ArrayBuffer:
 			a = new Uint8Array(a);
@@ -740,8 +744,9 @@ const equalityDeep = (a, b) => {
 			if (a.size !== b.size) return false;
 			for (const key of a.keys()) if (!b.has(key) || !equalityDeep(a.get(key), b.get(key))) return false;
 			break;
+		case void 0:
 		case Object:
-			if (length(a) !== length(b)) return false;
+			if (size(a) !== size(b)) return false;
 			for (const key in a) if (!hasProperty(a, key) || !equalityDeep(a[key], b[key])) return false;
 			break;
 		case Array:
@@ -756,7 +761,7 @@ const equalityDeep = (a, b) => {
 const isArray = isArray$1;
 
 //#endregion
-//#region node_modules/y-protocols/awareness.js
+//#region node_modules/.pnpm/y-protocols@1.0.7_yjs@13.6.29/node_modules/y-protocols/awareness.js
 /**
 * @module awareness-protocol
 */
@@ -1048,7 +1053,7 @@ var IncomingMessage = class {
 		return writeVarUint8Array(this.encoder, data);
 	}
 	length() {
-		return length$1(this.encoder);
+		return length(this.encoder);
 	}
 };
 
@@ -1062,6 +1067,8 @@ let MessageType = /* @__PURE__ */ function(MessageType) {
 	MessageType[MessageType["Stateless"] = 5] = "Stateless";
 	MessageType[MessageType["CLOSE"] = 7] = "CLOSE";
 	MessageType[MessageType["SyncStatus"] = 8] = "SyncStatus";
+	MessageType[MessageType["Ping"] = 9] = "Ping";
+	MessageType[MessageType["Pong"] = 10] = "Pong";
 	return MessageType;
 }({});
 let WebSocketStatus = /* @__PURE__ */ function(WebSocketStatus) {
@@ -1102,7 +1109,10 @@ var CloseMessage = class extends OutgoingMessage {
 
 //#endregion
 //#region packages/provider/src/HocuspocusProviderWebsocket.ts
-var HocuspocusProviderWebsocket = class extends EventEmitter {
+var HocuspocusProviderWebsocket = class HocuspocusProviderWebsocket extends EventEmitter {
+	static {
+		this.DEDUPLICATABLE_TYPES = new Set([MessageType.Awareness, MessageType.QueryAwareness]);
+	}
 	constructor(configuration) {
 		super();
 		this.messageQueue = [];
@@ -1169,14 +1179,20 @@ var HocuspocusProviderWebsocket = class extends EventEmitter {
 		this.receivedOnOpenPayload = event;
 	}
 	attach(provider) {
-		this.configuration.providerMap.set(provider.configuration.name, provider);
+		const key = provider.effectiveName;
+		const existing = this.configuration.providerMap.get(key);
+		if (existing && existing !== provider) {
+			if (existing.isAuthenticated) throw new Error(`Cannot attach two providers with the same effective name "${key}". Use sessionAwareness: true to multiplex providers with the same document name.`);
+		}
+		this.configuration.providerMap.set(key, provider);
 		if (this.status === WebSocketStatus.Disconnected && this.shouldConnect) this.connect();
 		if (this.receivedOnOpenPayload && this.status === WebSocketStatus.Connected) provider.onOpen(this.receivedOnOpenPayload);
 	}
 	detach(provider) {
-		if (this.configuration.providerMap.has(provider.configuration.name)) {
-			provider.send(CloseMessage, { documentName: provider.configuration.name });
-			this.configuration.providerMap.delete(provider.configuration.name);
+		const key = provider.effectiveName;
+		if (this.configuration.providerMap.has(key)) {
+			provider.send(CloseMessage, { documentName: key });
+			this.configuration.providerMap.delete(key);
 		}
 	}
 	setConfiguration(configuration = {}) {
@@ -1276,8 +1292,21 @@ var HocuspocusProviderWebsocket = class extends EventEmitter {
 	onMessage(event) {
 		this.resolveConnectionAttempt();
 		this.lastMessageReceived = getUnixTime();
-		const documentName = new IncomingMessage(event.data).peekVarString();
-		this.configuration.providerMap.get(documentName)?.onMessage(event);
+		const data = new Uint8Array(event.data);
+		if (data.length === 1 && data[0] === MessageType.Ping) {
+			this.sendPong();
+			return;
+		}
+		const rawKey = new IncomingMessage(data).peekVarString();
+		this.configuration.providerMap.get(rawKey)?.onMessage(event);
+	}
+	/**
+	* Send application-level Pong response to server Ping
+	*/
+	sendPong() {
+		const encoder = createEncoder();
+		writeVarUint(encoder, MessageType.Pong);
+		this.send(toUint8Array(encoder));
 	}
 	resolveConnectionAttempt() {
 		if (this.connectionAttempt) {
@@ -1332,9 +1361,32 @@ var HocuspocusProviderWebsocket = class extends EventEmitter {
 			console.error(e);
 		}
 	}
+	parseQueuedMessage(message) {
+		try {
+			const decoder = createDecoder(message);
+			return {
+				documentName: readVarString(decoder),
+				messageType: readVarUint(decoder)
+			};
+		} catch {
+			return null;
+		}
+	}
+	addToQueue(message) {
+		if (message instanceof Uint8Array) {
+			const parsed = this.parseQueuedMessage(message);
+			if (parsed && HocuspocusProviderWebsocket.DEDUPLICATABLE_TYPES.has(parsed.messageType)) this.messageQueue = this.messageQueue.filter((queued) => {
+				if (!(queued instanceof Uint8Array)) return true;
+				const queuedParsed = this.parseQueuedMessage(queued);
+				if (!queuedParsed) return true;
+				return !(queuedParsed.documentName === parsed.documentName && queuedParsed.messageType === parsed.messageType);
+			});
+		}
+		this.messageQueue.push(message);
+	}
 	send(message) {
 		if (this.webSocket?.readyState === WsReadyStates.Open) this.webSocket.send(message);
-		else this.messageQueue.push(message);
+		else this.addToQueue(message);
 	}
 	onClose({ event }) {
 		this.closeTries = 0;
@@ -1358,7 +1410,7 @@ var HocuspocusProviderWebsocket = class extends EventEmitter {
 };
 
 //#endregion
-//#region node_modules/y-protocols/sync.js
+//#region node_modules/.pnpm/y-protocols@1.0.7_yjs@13.6.29/node_modules/y-protocols/sync.js
 /**
 * @module sync-protocol
 */
@@ -1426,11 +1478,13 @@ const readSyncStep1 = (decoder, encoder, doc) => writeSyncStep2(encoder, doc, re
 * @param {decoding.Decoder} decoder
 * @param {Y.Doc} doc
 * @param {any} transactionOrigin
+* @param {(error:Error)=>any} [errorHandler]
 */
-const readSyncStep2 = (decoder, doc, transactionOrigin) => {
+const readSyncStep2 = (decoder, doc, transactionOrigin, errorHandler) => {
 	try {
 		Y.applyUpdate(doc, readVarUint8Array(decoder), transactionOrigin);
 	} catch (error) {
+		if (errorHandler != null) errorHandler(error);
 		console.error("Caught error while handling a Yjs update", error);
 	}
 };
@@ -1448,6 +1502,7 @@ const writeUpdate = (encoder, update) => {
 * @param {decoding.Decoder} decoder
 * @param {Y.Doc} doc
 * @param {any} transactionOrigin
+* @param {(error:Error)=>any} [errorHandler]
 */
 const readUpdate = readSyncStep2;
 /**
@@ -1455,18 +1510,19 @@ const readUpdate = readSyncStep2;
 * @param {encoding.Encoder} encoder The reply message. Does not need to be sent if empty.
 * @param {Y.Doc} doc
 * @param {any} transactionOrigin
+* @param {(error:Error)=>any} [errorHandler] Optional error handler that catches errors when reading Yjs messages.
 */
-const readSyncMessage = (decoder, encoder, doc, transactionOrigin) => {
+const readSyncMessage = (decoder, encoder, doc, transactionOrigin, errorHandler) => {
 	const messageType = readVarUint(decoder);
 	switch (messageType) {
 		case messageYjsSyncStep1:
 			readSyncStep1(decoder, encoder, doc);
 			break;
 		case messageYjsSyncStep2:
-			readSyncStep2(decoder, doc, transactionOrigin);
+			readSyncStep2(decoder, doc, transactionOrigin, errorHandler);
 			break;
 		case messageYjsUpdate:
-			readUpdate(decoder, doc, transactionOrigin);
+			readUpdate(decoder, doc, transactionOrigin, errorHandler);
 			break;
 		default: throw new Error("Unknown message type");
 	}
@@ -1505,15 +1561,13 @@ var MessageReceiver = class {
 			case MessageType.CLOSE:
 				const event = {
 					code: 1e3,
-					reason: readVarString(message.decoder),
-					target: provider.configuration.websocketProvider.webSocket,
-					type: "close"
+					reason: readVarString(message.decoder)
 				};
 				provider.onClose();
 				provider.configuration.onClose({ event });
 				provider.forwardClose({ event });
 				break;
-			default: throw new Error(`Can’t apply message of unknown type: ${type}`);
+			default: console.error(`Can’t apply message of unknown type: ${type}`);
 		}
 		if (message.length() > emptyMessageLength + 1) provider.send(OutgoingMessage, { encoder: message.encoder });
 	}
@@ -1558,6 +1612,10 @@ var MessageSender = class {
 	}
 };
 
+//#endregion
+//#region packages/provider/src/version.ts
+const version = "4.0.0-rc.1";
+
 //#endregion
 //#region packages/provider/src/OutgoingMessages/AuthenticationMessage.ts
 var AuthenticationMessage = class extends OutgoingMessage {
@@ -1571,6 +1629,7 @@ var AuthenticationMessage = class extends OutgoingMessage {
 		writeVarString(this.encoder, args.documentName);
 		writeVarUint(this.encoder, this.type);
 		writeAuthentication(this.encoder, args.token);
+		writeVarString(this.encoder, version);
 		return this.encoder;
 	}
 };
@@ -1654,6 +1713,14 @@ var AwarenessError = class extends Error {
 	}
 };
 var HocuspocusProvider = class extends EventEmitter {
+	/**
+	* The effective name used as the first VarString in messages.
+	* When `sessionAwareness` is enabled, returns a composite key (documentName\0sessionId).
+	* Otherwise, returns the plain document name.
+	*/
+	get effectiveName() {
+		return this.configuration.sessionAwareness ? makeRoutingKey(this.configuration.name, this.sessionId) : this.configuration.name;
+	}
 	constructor(configuration) {
 		super();
 		this.configuration = {
@@ -1661,6 +1728,7 @@ var HocuspocusProvider = class extends EventEmitter {
 			document: void 0,
 			awareness: void 0,
 			token: null,
+			sessionAwareness: true,
 			forceSyncInterval: false,
 			onAuthenticated: () => null,
 			onAuthenticationFailed: () => null,
@@ -1684,6 +1752,7 @@ var HocuspocusProvider = class extends EventEmitter {
 		this.authorizedScope = void 0;
 		this.manageSocket = false;
 		this._isAttached = false;
+		this.sessionId = Math.random().toString(36).slice(2);
 		this.intervals = { forceSync: null };
 		this.boundDocumentUpdateHandler = this.documentUpdateHandler.bind(this);
 		this.boundAwarenessUpdateHandler = this.awarenessUpdateHandler.bind(this);
@@ -1760,7 +1829,7 @@ var HocuspocusProvider = class extends EventEmitter {
 		this.resetUnsyncedChanges();
 		this.send(SyncStepOneMessage, {
 			document: this.document,
-			documentName: this.configuration.name
+			documentName: this.effectiveName
 		});
 	}
 	pageHide() {
@@ -1772,7 +1841,7 @@ var HocuspocusProvider = class extends EventEmitter {
 	}
 	sendStateless(payload) {
 		this.send(StatelessMessage, {
-			documentName: this.configuration.name,
+			documentName: this.effectiveName,
 			payload
 		});
 	}
@@ -1786,7 +1855,7 @@ var HocuspocusProvider = class extends EventEmitter {
 		}
 		this.send(AuthenticationMessage, {
 			token: token ?? "",
-			documentName: this.configuration.name
+			documentName: this.effectiveName
 		});
 	}
 	documentUpdateHandler(update, origin) {
@@ -1794,7 +1863,7 @@ var HocuspocusProvider = class extends EventEmitter {
 		this.incrementUnsyncedChanges();
 		this.send(UpdateMessage, {
 			update,
-			documentName: this.configuration.name
+			documentName: this.effectiveName
 		});
 	}
 	awarenessUpdateHandler({ added, updated, removed }, origin) {
@@ -1802,7 +1871,7 @@ var HocuspocusProvider = class extends EventEmitter {
 		this.send(AwarenessMessage, {
 			awareness: this.awareness,
 			clients: changedClients,
-			documentName: this.configuration.name
+			documentName: this.effectiveName
 		});
 	}
 	/**
@@ -1844,12 +1913,12 @@ var HocuspocusProvider = class extends EventEmitter {
 		this.resetUnsyncedChanges();
 		this.send(SyncStepOneMessage, {
 			document: this.document,
-			documentName: this.configuration.name
+			documentName: this.effectiveName
 		});
 		if (this.awareness && this.awareness.getLocalState() !== null) this.send(AwarenessMessage, {
 			awareness: this.awareness,
 			clients: [this.document.clientID],
-			documentName: this.configuration.name
+			documentName: this.effectiveName
 		});
 	}
 	send(message, args) {
@@ -1860,8 +1929,8 @@ var HocuspocusProvider = class extends EventEmitter {
 	}
 	onMessage(event) {
 		const message = new IncomingMessage(event.data);
-		const documentName = message.readVarString();
-		message.writeVarString(documentName);
+		const { documentName } = parseRoutingKey(message.readVarString());
+		message.writeVarString(this.effectiveName);
 		this.emit("message", {
 			event,
 			message: new IncomingMessage(event.data)