@inditextech/weave-store-azure-web-pubsub 2.0.2 → 2.1.0

package/dist/client.d.ts

@@ -1,11 +1,13 @@
 import { WeaveStore } from "@inditextech/weave-sdk";
-import { WeaveStoreOptions } from "@inditextech/weave-types";
+import { DeepPartial, WeaveStoreOptions } from "@inditextech/weave-types";
 import ReconnectingWebSocket from "reconnecting-websocket";
 import { Doc } from "yjs";
 import Emittery from "emittery";
 import * as awarenessProtocol from "y-protocols/awareness";
 import { WebSocket } from "ws";
 import { TokenCredential } from "@azure/identity";
+import { Encoder } from "lib0/encoding";
+import { Decoder } from "lib0/decoding";
 
 //#region src/server/event-handler/cloud-events-protocols.d.ts
 /**
@@ -80,6 +82,12 @@ interface MqttConnectionContextProperties {
 * Request for the connect event.
 */
 declare const WEAVE_STORE_AZURE_WEB_PUBSUB = "store-azure-web-pubsub";
+declare const WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS: {
+  "CONNECTING": string;
+  "CONNECTED": string;
+  "DISCONNECTED": string;
+  "ERROR": string;
+};
 declare const WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE: {
   "PUB": string;
   "SUB": string;
@@ -92,13 +100,13 @@ declare const WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG: {
 //#region src/types.d.ts
 type WeaveStoreAzureWebPubsubConfig = {
   endpoint: string;
+  persistIntervalMs?: number;
   hubName: string;
   auth?: {
     key?: string;
     custom?: TokenCredential;
   };
-  connectionHandlers?: Pick<WeaveAzureWebPubsubSyncHandlerOptions, "onConnect" | "onConnected" | "removeConnection" | "getConnectionRoom" | "getRoomConnections">;
-  persistIntervalMs?: number;
+  connectionHandlers?: DeepPartial<WeaveAzureWebPubsubSyncHandlerOptions>;
 };
 type WeaveAzureWebPubsubSyncHandlerOptions = {
   onConnect?: (connectionId: string, queries: Record<string, string[]> | undefined) => Promise<void>;
@@ -161,13 +169,42 @@ type WeaveStoreAzureWebPubsubOnWebsocketErrorEvent = {
 type WeaveStoreAzureWebPubsubOnWebsocketOnTokenRefreshEvent = {
   group: string;
 };
-
-//#endregion
-//#region src/client.d.ts
-interface ClientOptions {
+type WeaveStoreAzureWebPubSubSyncHostClientConnectOptions = {
+  expirationTimeInMinutes?: number;
+};
+type WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys = keyof typeof WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS;
+type WeaveStoreAzureWebPubSubSyncClientConnectionStatus = (typeof WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS)[WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys];
+declare enum MessageType {
+  System = "system",
+  JoinGroup = "joinGroup",
+  SendToGroup = "sendToGroup",
+}
+declare enum MessageDataType {
+  Init = "init",
+  Sync = "sync",
+  Awareness = "awareness",
+}
+interface MessageData {
+  group: string;
+  t: string;
+  f: string;
+  c: string;
+}
+interface Message {
+  type: string;
+  fromUserId: string;
+  from: string;
+  group: string;
+  data: MessageData;
+}
+type MessageHandler = (encoder: Encoder, decoder: Decoder, client: WeaveStoreAzureWebPubSubSyncClient, clientId: string, emitSynced: boolean, messageType: number) => void;
+interface WeaveStoreAzureWebPubSubSyncClientOptions {
   resyncInterval: number;
   tokenProvider: Promise<string> | null;
 }
+
+//#endregion
+//#region src/client.d.ts
 declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   doc: Doc;
   topic: string;
@@ -179,6 +216,8 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   private _wsConnected;
   private _synced;
   private _resyncInterval;
+  private _resyncCheckInterval;
+  private _lastReceivedSyncResponse;
   private _connectionRetries;
   private _uuid;
   private _awareness;
@@ -193,20 +232,23 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   * @param {number} [options.resyncInterval] Request server state every `resyncInterval` milliseconds.
   * @param {number} [options.tokenProvider] token generator for negotiation.
   */
-  constructor(instance: WeaveStoreAzureWebPubsub, url: string, topic: string, doc: Doc, options?: ClientOptions);
+  constructor(instance: WeaveStoreAzureWebPubsub, url: string, topic: string, doc: Doc, options?: WeaveStoreAzureWebPubSubSyncClientOptions);
   get awareness(): awarenessProtocol.Awareness;
   get synced(): boolean;
   set synced(state: boolean);
   get ws(): ReconnectingWebSocket | null;
   get id(): string;
   getClientId(): string;
+  saveLastSyncResponse(): void;
   setupResyncInterval(): void;
-  destroy(): void;
-  stop(): void;
+  cleanupResyncInterval(): void;
+  simulateWebsocketError(): void;
+  disconnect(): void;
   setFetchClient(fetchClient?: FetchClient): void;
-  fetchConnectionUrl(): Promise<string>;
-  createWebSocket(): Promise<ReconnectingWebSocket>;
-  start(): Promise<void>;
+  fetchConnectionUrl(connectionUrlExtraParams?: Record<string, string>): Promise<string>;
+  createWebSocket(connectionUrlExtraParams?: Record<string, string>): Promise<ReconnectingWebSocket>;
+  setAndEmitStatusInfo(status: WeaveStoreAzureWebPubSubSyncClientConnectionStatus): void;
+  connect(connectionUrlExtraParams?: Record<string, string>): Promise<void>;
 }
 
 //#endregion
@@ -226,11 +268,13 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   private init;
   emitEvent<T>(name: string, payload?: T): void;
   getClientId(): string | null;
-  connect(): Promise<void>;
+  connect(extraParams?: Record<string, string>): Promise<void>;
   disconnect(): void;
+  simulateWebsocketError(): void;
+  destroy(): void;
   handleAwarenessChange(emit?: boolean): void;
   setAwarenessInfo<T>(field: string, value: T): void;
 }
 
 //#endregion
-export { FetchClient, FetchInitialState, FetchRoom, PersistRoom, WEAVE_STORE_AZURE_WEB_PUBSUB, WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubSyncHandlerOptions, WeaveStoreAzureWebPubsub, WeaveStoreAzureWebPubsubConfig, WeaveStoreAzureWebPubsubEvents, WeaveStoreAzureWebPubsubOnConnectEvent, WeaveStoreAzureWebPubsubOnConnectedEvent, WeaveStoreAzureWebPubsubOnDisconnectedEvent, WeaveStoreAzureWebPubsubOnStoreFetchConnectionUrlEvent, WeaveStoreAzureWebPubsubOnWebsocketCloseEvent, WeaveStoreAzureWebPubsubOnWebsocketErrorEvent, WeaveStoreAzureWebPubsubOnWebsocketJoinGroupEvent, WeaveStoreAzureWebPubsubOnWebsocketMessageEvent, WeaveStoreAzureWebPubsubOnWebsocketOnTokenRefreshEvent, WeaveStoreAzureWebPubsubOnWebsocketOpenEvent, WeaveStoreAzureWebPubsubOptions };
+export { FetchClient, FetchInitialState, FetchRoom, Message, MessageData, MessageDataType, MessageHandler, MessageType, PersistRoom, WEAVE_STORE_AZURE_WEB_PUBSUB, WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS, WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubSyncHandlerOptions, WeaveStoreAzureWebPubSubSyncClientConnectionStatus, WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys, WeaveStoreAzureWebPubSubSyncClientOptions, WeaveStoreAzureWebPubSubSyncHostClientConnectOptions, WeaveStoreAzureWebPubsub, WeaveStoreAzureWebPubsubConfig, WeaveStoreAzureWebPubsubEvents, WeaveStoreAzureWebPubsubOnConnectEvent, WeaveStoreAzureWebPubsubOnConnectedEvent, WeaveStoreAzureWebPubsubOnDisconnectedEvent, WeaveStoreAzureWebPubsubOnStoreFetchConnectionUrlEvent, WeaveStoreAzureWebPubsubOnWebsocketCloseEvent, WeaveStoreAzureWebPubsubOnWebsocketErrorEvent, WeaveStoreAzureWebPubsubOnWebsocketJoinGroupEvent, WeaveStoreAzureWebPubsubOnWebsocketMessageEvent, WeaveStoreAzureWebPubsubOnWebsocketOnTokenRefreshEvent, WeaveStoreAzureWebPubsubOnWebsocketOpenEvent, WeaveStoreAzureWebPubsubOptions };

package/dist/client.js

@@ -3693,11 +3693,7 @@ const applyAwarenessUpdate = (awareness, update, origin) => {
 };
 
 //#endregion
-//#region src/client.ts
-const messageSyncStep1 = 0;
-const messageAwareness = 1;
-const messageQueryAwareness = 3;
-const AzureWebPubSubJsonProtocol = "json.webpubsub.azure.v1";
+//#region src/types.ts
 let MessageType = /* @__PURE__ */ function(MessageType$1) {
 	MessageType$1["System"] = "system";
 	MessageType$1["JoinGroup"] = "joinGroup";
@@ -3710,6 +3706,28 @@ let MessageDataType = /* @__PURE__ */ function(MessageDataType$1) {
 	MessageDataType$1["Awareness"] = "awareness";
 	return MessageDataType$1;
 }({});
+
+//#endregion
+//#region src/constants.ts
+const WEAVE_STORE_AZURE_WEB_PUBSUB = "store-azure-web-pubsub";
+const WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS = {
+	["CONNECTING"]: "connecting",
+	["CONNECTED"]: "connected",
+	["DISCONNECTED"]: "disconnected",
+	["ERROR"]: "error"
+};
+const WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE = {
+	["PUB"]: "pub",
+	["SUB"]: "sub"
+};
+const WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG = { resyncIntervalMs: 15e3 };
+
+//#endregion
+//#region src/client.ts
+const messageSyncStep1 = 0;
+const messageAwareness = 1;
+const messageQueryAwareness = 3;
+const AzureWebPubSubJsonProtocol = "json.webpubsub.azure.v1";
 const messageHandlers = [];
 messageHandlers[messageSyncStep1] = (encoder, decoder, client, clientId, emitSynced, messageType) => {
 	writeVarUint(encoder, messageType);
@@ -3727,6 +3745,7 @@ const readMessage = (client, buf, emitSynced, clientId) => {
 	const decoder = createDecoder(buf);
 	const encoder = createEncoder();
 	const messageType = readVarUint(decoder);
+	if (messageType === 0) client.saveLastSyncResponse();
 	const messageHandler = messageHandlers[messageType];
 	if (messageHandler) messageHandler(encoder, decoder, client, clientId, emitSynced, messageType);
 	else throw new Error(`unable to handle message with type: ${messageType}`);
@@ -3752,15 +3771,17 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 		this._fetchClient = fetch;
 		this._url = url;
 		this._uuid = v4();
-		this._status = "disconnected";
+		this._status = WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.DISCONNECTED;
 		this._wsConnected = false;
 		this._initialized = false;
 		this._connectionRetries = 0;
 		this._synced = false;
 		this._ws = null;
-		const awareness = new Awareness(doc);
-		this._awareness = awareness;
 		this._resyncInterval = null;
+		this._resyncCheckInterval = null;
+		this._lastReceivedSyncResponse = null;
+		const awareness = new Awareness(this.doc);
+		this._awareness = awareness;
 		this._updateHandler = (update, origin) => {
 			if (origin !== this) {
 				const encoder = createEncoder();
@@ -3774,10 +3795,10 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			const changedClients = added.concat(updated).concat(removed);
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageAwareness);
-			writeVarUint8Array(encoder, encodeAwarenessUpdate(awareness, changedClients));
+			writeVarUint8Array(encoder, encodeAwarenessUpdate(this.awareness, changedClients));
 			sendToControlGroup(this, topic, MessageDataType.Awareness, toUint8Array(encoder));
 		};
-		awareness.on("update", this._awarenessUpdateHandler);
+		this._awareness.on("update", this._awarenessUpdateHandler);
 	}
 	get awareness() {
 		return this._awareness;
@@ -3797,38 +3818,80 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 	getClientId() {
 		return this.id;
 	}
+	saveLastSyncResponse() {
+		const now = new Date();
+		this._lastReceivedSyncResponse = now.getTime();
+		this.instance.emitEvent("onSyncResponse", this._lastReceivedSyncResponse);
+	}
 	setupResyncInterval() {
-		if (this._options.resyncInterval > 0) this._resyncInterval = setInterval(() => {
-			if (this._ws && this._wsConnected) {
-				const encoder = createEncoder();
-				writeVarUint(encoder, messageSyncStep1);
-				writeSyncStep1(encoder, this.doc);
-				sendToControlGroup(this, this.topic, MessageDataType.Sync, toUint8Array(encoder));
-			}
-		}, this._options.resyncInterval);
+		if (this._options.resyncInterval > 0) {
+			this._resyncInterval = setInterval(() => {
+				if (this._ws && this._wsConnected) {
+					const encoder = createEncoder();
+					writeVarUint(encoder, messageSyncStep1);
+					writeSyncStep1(encoder, this.doc);
+					sendToControlGroup(this, this.topic, MessageDataType.Sync, toUint8Array(encoder));
+				}
+			}, this._options.resyncInterval);
+			this._resyncCheckInterval = setInterval(() => {
+				if (!this._lastReceivedSyncResponse) return;
+				const resyncInSeconds = this._options.resyncInterval / 1e3;
+				const resyncLimitInSeconds = resyncInSeconds + 5;
+				const now = new Date();
+				const diffInSeconds = (now.getTime() - this._lastReceivedSyncResponse) / 1e3;
+				if (diffInSeconds > resyncLimitInSeconds && this._ws?.readyState === WebSocket.OPEN) {
+					this._ws.dispatchEvent(new CustomEvent("error", {
+						cancelable: false,
+						bubbles: false,
+						detail: new Error("No sync response")
+					}));
+					this._ws._ws.close();
+				}
+			}, this._options.resyncInterval + 5e3);
+		}
 	}
-	destroy() {
-		if (this._resyncInterval) clearInterval(this._resyncInterval);
-		this.stop();
-		this.doc.off("update", this._updateHandler);
+	cleanupResyncInterval() {
+		if (this._resyncInterval) {
+			clearInterval(this._resyncInterval);
+			this._resyncInterval = null;
+		}
+		if (this._resyncCheckInterval) {
+			clearInterval(this._resyncCheckInterval);
+			this._resyncCheckInterval = null;
+		}
+	}
+	simulateWebsocketError() {
+		if (this._ws) this._ws._ws.close(4e3, new Error("Simulated error for testing"));
 	}
-	stop() {
+	disconnect() {
 		if (this._ws !== null) {
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageAwareness);
 			writeVarUint8Array(encoder, encodeAwarenessUpdate(this.awareness, [this.doc.clientID], new Map()));
 			const u8 = toUint8Array(encoder);
 			sendToControlGroup(this, this.topic, MessageDataType.Awareness, u8);
+			removeAwarenessStates(this.awareness, Array.from(this.awareness.getStates().keys()).filter((client) => client !== this.doc.clientID), this);
 			this._initialized = false;
-			if (this._ws.readyState === WebSocket.OPEN) this._ws.close();
+			this._ws.close();
 		}
+		this.cleanupResyncInterval();
+		this._wsConnected = false;
+		this._ws = null;
 	}
 	setFetchClient(fetchClient = window.fetch) {
 		this._fetchClient = fetchClient.bind(window);
 	}
-	async fetchConnectionUrl() {
+	async fetchConnectionUrl(connectionUrlExtraParams) {
 		try {
-			const res = await this._fetchClient(this._url);
+			const connectionURL = new URL(this._url, isRelativeUrl(this._url) ? window.location.origin : void 0);
+			if (connectionUrlExtraParams) {
+				const extraParamsKeys = Object.keys(connectionUrlExtraParams);
+				for (const key of extraParamsKeys) {
+					if (connectionURL.searchParams.has(key)) connectionURL.searchParams.delete(key);
+					connectionURL.searchParams.append(key, connectionUrlExtraParams[key]);
+				}
+			}
+			const res = await this._fetchClient(connectionURL.toString());
 			if (res.ok) {
 				const data = await res.json();
 				return data.url;
@@ -3837,7 +3900,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			throw new Error(`Failed to fetch connection url from: ${this._url}`);
 		}
 	}
-	async createWebSocket() {
+	async createWebSocket(connectionUrlExtraParams) {
 		const websocket = new ReconnectingWebSocket(async () => {
 			let url = "https://error";
 			let error = null;
@@ -3846,7 +3909,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 					loading: true,
 					error: null
 				});
-				url = await this.fetchConnectionUrl();
+				url = await this.fetchConnectionUrl(connectionUrlExtraParams);
 			} catch (ex) {
 				error = ex;
 			} finally {
@@ -3864,14 +3927,12 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 		this._initialized = false;
 		this.synced = false;
 		websocket.addEventListener("error", (e) => {
-			if (e) console.error("Websocket error", e);
+			console.error("WebSocket error", e);
 			if (this._initialized && websocket.retryCount > 0) {
-				this._status = "connecting";
-				this.emit("status", this._status);
+				this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.CONNECTING);
 				return;
 			}
-			this._status = "error";
-			this.emit("status", this._status);
+			this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.ERROR);
 		});
 		websocket.onmessage = (event) => {
 			if (event.data === null) return;
@@ -3883,24 +3944,18 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			const encoder = readMessage(this, buf, true, messageData.f);
 			if (length$1(encoder) > 1) sendToControlGroup(this, this.topic, MessageDataType.Sync, toUint8Array(encoder));
 		};
-		websocket.onclose = (ev) => {
-			this._status = "disconnected";
-			this.emit("status", this._status);
+		websocket.onclose = () => {
+			if ((this._ws?.retryCount ?? 0) > 0) this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.CONNECTING);
+			else this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.DISCONNECTED);
 			if (this._wsConnected) {
-				if (this._resyncInterval) clearInterval(this._resyncInterval);
-				this._resyncInterval = null;
+				this.cleanupResyncInterval();
 				this._wsConnected = false;
 				this.synced = false;
 				removeAwarenessStates(this.awareness, Array.from(this.awareness.getStates().keys()).filter((x) => x !== this.doc.clientID), this);
 			}
-			if (ev.code === 1008 && websocket.readyState === WebSocket.OPEN) {
-				websocket.close();
-				this.createWebSocket();
-			}
 		};
 		websocket.onopen = () => {
-			this._status = "connected";
-			this.emit("status", this._status);
+			this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.CONNECTED);
 			this._wsConnected = true;
 			this._initialized = true;
 			this._connectionRetries = this._connectionRetries++;
@@ -3911,19 +3966,31 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			writeSyncStep1(encoder, this.doc);
 			const u8 = toUint8Array(encoder);
 			sendToControlGroup(this, this.topic, MessageDataType.Init, u8);
+			const encoderState = createEncoder();
+			writeVarUint(encoderState, messageSyncStep1);
+			writeSyncStep2(encoderState, this.doc);
+			sendToControlGroup(this, this.topic, MessageDataType.Init, u8);
+			const encoderAwarenessQuery = createEncoder();
+			writeVarUint(encoderAwarenessQuery, messageQueryAwareness);
+			sendToControlGroup(this, this.topic, MessageDataType.Init, u8);
 			if (this.awareness.getLocalState() !== null) {
 				const encoderAwarenessState = createEncoder();
 				writeVarUint(encoderAwarenessState, messageAwareness);
 				writeVarUint8Array(encoderAwarenessState, encodeAwarenessUpdate(this.awareness, [this.doc.clientID]));
-				const u8$1 = toUint8Array(encoder);
-				sendToControlGroup(this, this.topic, MessageDataType.Awareness, u8$1);
+				const u82 = toUint8Array(encoder);
+				sendToControlGroup(this, this.topic, MessageDataType.Awareness, u82);
 			}
 		};
+		this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.CONNECTING);
 		return websocket;
 	}
-	async start() {
+	setAndEmitStatusInfo(status) {
+		this._status = status;
+		this.emit("status", this._status);
+	}
+	async connect(connectionUrlExtraParams) {
 		if (this._wsConnected || this._ws) return;
-		await this.createWebSocket();
+		await this.createWebSocket(connectionUrlExtraParams);
 	}
 };
 function safeSend(data) {
@@ -3956,15 +4023,9 @@ function sendToControlGroup(client, group, type, u8) {
 	if (!safeSend(payload)) return;
 	client.ws?.send(payload);
 }
-
-//#endregion
-//#region src/constants.ts
-const WEAVE_STORE_AZURE_WEB_PUBSUB = "store-azure-web-pubsub";
-const WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE = {
-	["PUB"]: "pub",
-	["SUB"]: "sub"
-};
-const WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG = { resyncIntervalMs: 15e3 };
+function isRelativeUrl(url) {
+	return !/^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(url);
+}
 
 //#endregion
 //#region src/store-azure-web-pubsub.ts
@@ -3995,9 +4056,12 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 			resyncInterval: this.azureWebPubsubOptions.resyncIntervalMs,
 			tokenProvider: null
 		});
+		const awareness = this.provider.awareness;
+		awareness.on("update", this.handleAwarenessChange.bind(this));
+		awareness.on("change", this.handleAwarenessChange.bind(this));
 		window.addEventListener("beforeunload", () => {
-			const awareness = this.provider.awareness;
-			awareness.destroy();
+			const awareness$1 = this.provider.awareness;
+			if (awareness$1) awareness$1.destroy();
 		});
 		this.provider.on("error", () => {
 			this.handleConnectionStatusChange(WEAVE_STORE_CONNECTION_STATUS.DISCONNECTED);
@@ -4018,22 +4082,20 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 		if (this.provider) return this.provider.getClientId();
 		return null;
 	}
-	async connect() {
+	async connect(extraParams) {
 		const { fetchClient } = this.azureWebPubsubOptions;
-		const awareness = this.provider.awareness;
-		awareness.on("update", this.handleAwarenessChange.bind(this));
-		awareness.on("change", this.handleAwarenessChange.bind(this));
 		this.provider.setFetchClient(fetchClient ?? window.fetch);
-		await this.provider.start();
+		await this.provider.connect(extraParams);
 	}
 	disconnect() {
-		const awareness = this.provider.awareness;
-		awareness.destroy();
-		awareness.off("update", this.handleAwarenessChange.bind(this));
-		awareness.off("change", this.handleAwarenessChange.bind(this));
-		this.provider.destroy();
+		this.provider.disconnect();
+	}
+	simulateWebsocketError() {
+		this.provider.simulateWebsocketError();
 	}
+	destroy() {}
 	handleAwarenessChange(emit = true) {
+		if (!this.instance) return;
 		const awareness = this.provider.awareness;
 		const values = Array.from(awareness.getStates().values());
 		values.splice(awareness.clientID, 1);
@@ -4046,4 +4108,4 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 };
 
 //#endregion
-export { WEAVE_STORE_AZURE_WEB_PUBSUB, WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveStoreAzureWebPubsub };
+export { MessageDataType, MessageType, WEAVE_STORE_AZURE_WEB_PUBSUB, WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS, WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveStoreAzureWebPubsub };

package/dist/server.d.ts

@@ -5,20 +5,116 @@ import { Doc } from "yjs";
 import { WebSocket } from "ws";
 import koa from "koa";
 import Emittery from "emittery";
-import express from "express-serve-static-core";
+import ReconnectingWebSocket from "reconnecting-websocket";
+import * as awarenessProtocol$1 from "y-protocols/awareness";
 import * as awarenessProtocol from "y-protocols/awareness";
+import { WeaveStore } from "@inditextech/weave-sdk";
+import { DeepPartial, WeaveStoreOptions } from "@inditextech/weave-types";
+import { Encoder } from "lib0/encoding";
+import { Decoder } from "lib0/decoding";
+import express from "express-serve-static-core";
 import { RequestHandler } from "express";
 
+//#region src/constants.d.ts
+declare const WEAVE_STORE_AZURE_WEB_PUBSUB = "store-azure-web-pubsub";
+declare const WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS: {
+  "CONNECTING": string;
+  "CONNECTED": string;
+  "DISCONNECTED": string;
+  "ERROR": string;
+};
+declare const WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE: {
+  "PUB": string;
+  "SUB": string;
+};
+declare const WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG: {
+  resyncIntervalMs: number;
+};
+
+//#endregion
+//#region src/store-azure-web-pubsub.d.ts
+declare class WeaveStoreAzureWebPubsub extends WeaveStore {
+  private azureWebPubsubOptions;
+  private roomId;
+  private started;
+  private initialRoomData;
+  protected provider: WeaveStoreAzureWebPubSubSyncClient;
+  protected name: string;
+  protected supportsUndoManager: boolean;
+  protected awarenessCallback: (changes: any) => void;
+  constructor(initialRoomData: Uint8Array | FetchInitialState | undefined, storeOptions: WeaveStoreOptions, azureWebPubsubOptions: Pick<WeaveStoreAzureWebPubsubOptions, "roomId" | "url"> & Partial<Omit<WeaveStoreAzureWebPubsubOptions, "roomId" | "url">>);
+  setup(): void;
+  private loadRoomInitialData;
+  private init;
+  emitEvent<T>(name: string, payload?: T): void;
+  getClientId(): string | null;
+  connect(extraParams?: Record<string, string>): Promise<void>;
+  disconnect(): void;
+  simulateWebsocketError(): void;
+  destroy(): void;
+  handleAwarenessChange(emit?: boolean): void;
+  setAwarenessInfo<T>(field: string, value: T): void;
+}
+
+//#endregion
+//#region src/client.d.ts
+declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
+  doc: Doc;
+  topic: string;
+  private instance;
+  private _ws;
+  private _url;
+  private _fetchClient;
+  private _status;
+  private _wsConnected;
+  private _synced;
+  private _resyncInterval;
+  private _resyncCheckInterval;
+  private _lastReceivedSyncResponse;
+  private _connectionRetries;
+  private _uuid;
+  private _awareness;
+  private _options;
+  private _initialized;
+  private _updateHandler;
+  private _awarenessUpdateHandler;
+  /**
+  * @param {string} url
+  * @param {string} topic
+  * @param {Doc} doc
+  * @param {number} [options.resyncInterval] Request server state every `resyncInterval` milliseconds.
+  * @param {number} [options.tokenProvider] token generator for negotiation.
+  */
+  constructor(instance: WeaveStoreAzureWebPubsub, url: string, topic: string, doc: Doc, options?: WeaveStoreAzureWebPubSubSyncClientOptions);
+  get awareness(): awarenessProtocol$1.Awareness;
+  get synced(): boolean;
+  set synced(state: boolean);
+  get ws(): ReconnectingWebSocket | null;
+  get id(): string;
+  getClientId(): string;
+  saveLastSyncResponse(): void;
+  setupResyncInterval(): void;
+  cleanupResyncInterval(): void;
+  simulateWebsocketError(): void;
+  disconnect(): void;
+  setFetchClient(fetchClient?: FetchClient): void;
+  fetchConnectionUrl(connectionUrlExtraParams?: Record<string, string>): Promise<string>;
+  createWebSocket(connectionUrlExtraParams?: Record<string, string>): Promise<ReconnectingWebSocket>;
+  setAndEmitStatusInfo(status: WeaveStoreAzureWebPubSubSyncClientConnectionStatus): void;
+  connect(connectionUrlExtraParams?: Record<string, string>): Promise<void>;
+}
+
+//#endregion
 //#region src/types.d.ts
 type WeaveStoreAzureWebPubsubConfig = {
   endpoint: string;
+  persistIntervalMs?: number;
   hubName: string;
   auth?: {
     key?: string;
     custom?: TokenCredential;
   };
-  connectionHandlers?: Pick<WeaveAzureWebPubsubSyncHandlerOptions, "onConnect" | "onConnected" | "removeConnection" | "getConnectionRoom" | "getRoomConnections">;
-  persistIntervalMs?: number;
+  connectionHandlers?: DeepPartial<WeaveAzureWebPubsubSyncHandlerOptions>;
 };
 type WeaveAzureWebPubsubSyncHandlerOptions = {
   onConnect?: (connectionId: string, queries: Record<string, string[]> | undefined) => Promise<void>;
@@ -81,6 +177,39 @@ type WeaveStoreAzureWebPubsubOnWebsocketErrorEvent = {
 type WeaveStoreAzureWebPubsubOnWebsocketOnTokenRefreshEvent = {
   group: string;
 };
+type WeaveStoreAzureWebPubSubSyncHostClientConnectOptions = {
+  expirationTimeInMinutes?: number;
+};
+type WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys = keyof typeof WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS;
+type WeaveStoreAzureWebPubSubSyncClientConnectionStatus = (typeof WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS)[WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys];
+declare enum MessageType {
+  System = "system",
+  JoinGroup = "joinGroup",
+  SendToGroup = "sendToGroup",
+}
+declare enum MessageDataType {
+  Init = "init",
+  Sync = "sync",
+  Awareness = "awareness",
+}
+interface MessageData {
+  group: string;
+  t: string;
+  f: string;
+  c: string;
+}
+interface Message {
+  type: string;
+  fromUserId: string;
+  from: string;
+  group: string;
+  data: MessageData;
+}
+type MessageHandler = (encoder: Encoder, decoder: Decoder, client: WeaveStoreAzureWebPubSubSyncClient, clientId: string, emitSynced: boolean, messageType: number) => void;
+interface WeaveStoreAzureWebPubSubSyncClientOptions {
+  resyncInterval: number;
+  tokenProvider: Promise<string> | null;
+}
 
 //#endregion
 //#region src/server/event-handler/enum/mqtt-error-codes/mqtt-disconnect-reason-code.d.ts
@@ -407,7 +536,9 @@ declare enum MqttV500ConnectReasonCode {
   * Description: The connection rate limit has been exceeded.
   */
   ConnectionRateExceeded = 159,
-} //#endregion
+}
+
+//#endregion
 //#region src/server/event-handler/cloud-events-protocols.d.ts
 /**
 * Response of the connect event.
@@ -869,16 +1000,21 @@ declare class WebPubSubEventHandler {
 //#region src/server/azure-web-pubsub-host.d.ts
 declare class WeaveStoreAzureWebPubSubSyncHost {
   private readonly server;
+  private readonly syncHandler;
   doc: Y.Doc;
   topic: string;
   topicAwarenessChannel: string;
   private _client;
   private _conn;
+  private _reconnectAttempts;
+  private _forceClose;
   private _awareness;
-  constructor(server: WeaveAzureWebPubsubServer, client: WebPubSubServiceClient, topic: string, doc: Y.Doc);
+  private _updateHandler;
+  private _awarenessUpdateHandler;
+  constructor(server: WeaveAzureWebPubsubServer, syncHandler: WeaveAzureWebPubsubSyncHandler, client: WebPubSubServiceClient, topic: string, doc: Y.Doc);
   get awareness(): awarenessProtocol.Awareness;
   sendInitAwarenessInfo(origin: string): void;
-  createWebSocket(sleep?: number): Promise<void>;
+  createWebSocket(): Promise<void>;
   start(): Promise<void>;
   stop(): Promise<void>;
   simulateWebsocketError(): void;
@@ -901,17 +1037,19 @@ declare class WeaveAzureWebPubsubSyncHandler extends WebPubSubEventHandler {
   private readonly syncOptions?;
   private initialState;
   private readonly server;
+  private readonly roomsLastState;
   constructor(hub: string, server: WeaveAzureWebPubsubServer, client: WebPubSubServiceClient, initialState: FetchInitialState, syncHandlerOptions?: WeaveAzureWebPubsubSyncHandlerOptions, eventHandlerOptions?: WebPubSubEventHandlerOptions);
   private getNewYDoc;
   private setupRoomInstance;
-  private persistRoomTask;
+  isPersistingOnInterval(): boolean;
   private setupRoomInstancePersistence;
+  persistRoomTask(roomId: string): Promise<void>;
   private handleConnectionDisconnection;
   destroyRoomInstance(roomId: string): Promise<void>;
   private getHostConnection;
   getRoomsLoaded(): string[];
   getRoomSyncHost(roomId: string): WeaveStoreAzureWebPubSubSyncHost | undefined;
-  clientConnect(roomId: string): Promise<string>;
+  clientConnect(roomId: string, connectionOptions?: WeaveStoreAzureWebPubSubSyncHostClientConnectOptions): Promise<string>;
 }
 
 //#endregion
@@ -941,19 +1079,8 @@ declare class WeaveAzureWebPubsubServer extends Emittery {
   emitEvent<T>(event: string, payload?: T): void;
   addEventListener<T>(event: string, callback: (payload: T) => void): void;
   removeEventListener<T>(event: string, callback: (payload: T) => void): void;
-  clientConnect(roomId: string): Promise<string | null>;
+  clientConnect(roomId: string, connectionOptions?: WeaveStoreAzureWebPubSubSyncHostClientConnectOptions): Promise<string | null>;
 }
 
 //#endregion
-//#region src/constants.d.ts
-declare const WEAVE_STORE_AZURE_WEB_PUBSUB = "store-azure-web-pubsub";
-declare const WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE: {
-  "PUB": string;
-  "SUB": string;
-};
-declare const WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG: {
-  resyncIntervalMs: number;
-};
-
-//#endregion
-export { Certificate, ConnectErrorResponse, ConnectRequest, ConnectResponse, ConnectResponseHandler, ConnectedRequest, ConnectionContext, DisconnectedRequest, FetchClient, FetchInitialState, FetchRoom, MqttConnectErrorResponse, MqttConnectErrorResponseProperties, MqttConnectProperties, MqttConnectRequest, MqttConnectResponse, MqttConnectResponseProperties, MqttConnectionContextProperties, MqttDisconnectPacket, MqttDisconnectReasonCode, MqttDisconnectedProperties, MqttDisconnectedRequest, MqttUserProperty, MqttV311ConnectReturnCode, MqttV500ConnectReasonCode, PersistRoom, UserEventRequest, UserEventResponseHandler, WEAVE_STORE_AZURE_WEB_PUBSUB, WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubServer, WeaveAzureWebPubsubSyncHandlerOptions, WeaveStoreAzureWebPubSubSyncHost, WeaveStoreAzureWebPubsubConfig, WeaveStoreAzureWebPubsubEvents, WeaveStoreAzureWebPubsubOnConnectEvent, WeaveStoreAzureWebPubsubOnConnectedEvent, WeaveStoreAzureWebPubsubOnDisconnectedEvent, WeaveStoreAzureWebPubsubOnStoreFetchConnectionUrlEvent, WeaveStoreAzureWebPubsubOnWebsocketCloseEvent, WeaveStoreAzureWebPubsubOnWebsocketErrorEvent, WeaveStoreAzureWebPubsubOnWebsocketJoinGroupEvent, WeaveStoreAzureWebPubsubOnWebsocketMessageEvent, WeaveStoreAzureWebPubsubOnWebsocketOnTokenRefreshEvent, WeaveStoreAzureWebPubsubOnWebsocketOpenEvent, WeaveStoreAzureWebPubsubOptions, WebPubSubClientProtocol, WebPubSubEventHandler, WebPubSubEventHandlerOptions };
+export { Certificate, ConnectErrorResponse, ConnectRequest, ConnectResponse, ConnectResponseHandler, ConnectedRequest, ConnectionContext, DisconnectedRequest, FetchClient, FetchInitialState, FetchRoom, Message, MessageData, MessageDataType, MessageHandler, MessageType, MqttConnectErrorResponse, MqttConnectErrorResponseProperties, MqttConnectProperties, MqttConnectRequest, MqttConnectResponse, MqttConnectResponseProperties, MqttConnectionContextProperties, MqttDisconnectPacket, MqttDisconnectReasonCode, MqttDisconnectedProperties, MqttDisconnectedRequest, MqttUserProperty, MqttV311ConnectReturnCode, MqttV500ConnectReasonCode, PersistRoom, UserEventRequest, UserEventResponseHandler, WEAVE_STORE_AZURE_WEB_PUBSUB, WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS, WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubServer, WeaveAzureWebPubsubSyncHandlerOptions, WeaveStoreAzureWebPubSubSyncClientConnectionStatus, WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys, WeaveStoreAzureWebPubSubSyncClientOptions, WeaveStoreAzureWebPubSubSyncHost, WeaveStoreAzureWebPubSubSyncHostClientConnectOptions, WeaveStoreAzureWebPubsubConfig, WeaveStoreAzureWebPubsubEvents, WeaveStoreAzureWebPubsubOnConnectEvent, WeaveStoreAzureWebPubsubOnConnectedEvent, WeaveStoreAzureWebPubsubOnDisconnectedEvent, WeaveStoreAzureWebPubsubOnStoreFetchConnectionUrlEvent, WeaveStoreAzureWebPubsubOnWebsocketCloseEvent, WeaveStoreAzureWebPubsubOnWebsocketErrorEvent, WeaveStoreAzureWebPubsubOnWebsocketJoinGroupEvent, WeaveStoreAzureWebPubsubOnWebsocketMessageEvent, WeaveStoreAzureWebPubsubOnWebsocketOnTokenRefreshEvent, WeaveStoreAzureWebPubsubOnWebsocketOpenEvent, WeaveStoreAzureWebPubsubOptions, WebPubSubClientProtocol, WebPubSubEventHandler, WebPubSubEventHandlerOptions };

package/dist/server.js

@@ -8,6 +8,7 @@ import { URL as URL$1 } from "node:url";
 import { EOL } from "node:os";
 import process$1 from "node:process";
 import { WebSocket } from "ws";
+import crypto from "node:crypto";
 import { defaultInitialState } from "@inditextech/weave-sdk/server";
 
 //#region rolldown:runtime
@@ -18609,6 +18610,12 @@ var require_response = __commonJS({ "../../node_modules/koa/lib/response.js"(exp
 		set body(val) {
 			const original = this._body;
 			this._body = val;
+			const cleanupPreviousStream = () => {
+				if (original && isStream$1(original)) {
+					original.once("error", () => {});
+					if (!isStream$1(val)) destroy$1(original);
+				}
+			};
 			if (val == null) {
 				if (!statuses$3.empty[this.status]) {
 					if (this.type === "application/json") {
@@ -18621,6 +18628,7 @@ var require_response = __commonJS({ "../../node_modules/koa/lib/response.js"(exp
 				this.remove("Content-Type");
 				this.remove("Content-Length");
 				this.remove("Transfer-Encoding");
+				cleanupPreviousStream();
 				return;
 			}
 			if (!this._explicitStatus) this.status = 200;
@@ -18628,29 +18636,33 @@ var require_response = __commonJS({ "../../node_modules/koa/lib/response.js"(exp
 			if (typeof val === "string") {
 				if (setType) this.type = /^\s*</.test(val) ? "html" : "text";
 				this.length = Buffer.byteLength(val);
+				cleanupPreviousStream();
 				return;
 			}
 			if (Buffer.isBuffer(val)) {
 				if (setType) this.type = "bin";
 				this.length = val.length;
+				cleanupPreviousStream();
 				return;
 			}
 			if (isStream$1(val)) {
 				onFinish(this.res, destroy$1.bind(null, val));
 				if (original !== val) {
-					val.once("error", (err) => this.ctx.onerror(err));
 					if (original != null) this.remove("Content-Length");
+					cleanupPreviousStream();
 				}
 				if (setType) this.type = "bin";
 				return;
 			}
 			if (val instanceof ReadableStream) {
 				if (setType) this.type = "bin";
+				cleanupPreviousStream();
 				return;
 			}
 			if (val instanceof Blob) {
 				if (setType) this.type = "bin";
 				this.length = val.size;
+				cleanupPreviousStream();
 				return;
 			}
 			if (val instanceof Response) {
@@ -18658,10 +18670,12 @@ var require_response = __commonJS({ "../../node_modules/koa/lib/response.js"(exp
 				if (setType) this.type = "bin";
 				const headers = val.headers;
 				for (const key of headers.keys()) this.set(key, headers.get(key));
+				cleanupPreviousStream();
 				return;
 			}
 			this.remove("Content-Length");
 			if (!this.type || !/\bjson\b/i.test(this.type)) this.type = "json";
+			cleanupPreviousStream();
 		},
 		set length(n) {
 			if (!this.has("Transfer-Encoding")) this.set("Content-Length", n);
@@ -19818,19 +19832,19 @@ var require_delegates = __commonJS({ "../../node_modules/delegates/index.js"(exp
 //#endregion
 //#region ../../node_modules/tsscmp/lib/index.js
 var require_lib = __commonJS({ "../../node_modules/tsscmp/lib/index.js"(exports, module) {
-	var crypto$1 = __require("crypto");
+	var crypto$2 = __require("crypto");
 	function bufferEqual(a, b) {
 		if (a.length !== b.length) return false;
-		if (crypto$1.timingSafeEqual) return crypto$1.timingSafeEqual(a, b);
+		if (crypto$2.timingSafeEqual) return crypto$2.timingSafeEqual(a, b);
 		for (var i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
 		return true;
 	}
 	function timeSafeCompare(a, b) {
 		var sa = String(a);
 		var sb = String(b);
-		var key = crypto$1.pseudoRandomBytes(32);
-		var ah = crypto$1.createHmac("sha256", key).update(sa).digest();
-		var bh = crypto$1.createHmac("sha256", key).update(sb).digest();
+		var key = crypto$2.pseudoRandomBytes(32);
+		var ah = crypto$2.createHmac("sha256", key).update(sa).digest();
+		var bh = crypto$2.createHmac("sha256", key).update(sb).digest();
 		return bufferEqual(ah, bh) && a === b;
 	}
 	module.exports = timeSafeCompare;
@@ -19840,14 +19854,14 @@ var require_lib = __commonJS({ "../../node_modules/tsscmp/lib/index.js"(exports,
 //#region ../../node_modules/keygrip/index.js
 var require_keygrip = __commonJS({ "../../node_modules/keygrip/index.js"(exports, module) {
 	var compare = require_lib();
-	var crypto = __require("crypto");
+	var crypto$1 = __require("crypto");
 	function Keygrip$1(keys$1, algorithm, encoding) {
 		if (!algorithm) algorithm = "sha1";
 		if (!encoding) encoding = "base64";
 		if (!(this instanceof Keygrip$1)) return new Keygrip$1(keys$1, algorithm, encoding);
 		if (!keys$1 || !(0 in keys$1)) throw new Error("Keys must be provided.");
 		function sign(data, key) {
-			return crypto.createHmac(algorithm, key).update(data).digest(encoding).replace(/\/|\+|=/g, function(x) {
+			return crypto$1.createHmac(algorithm, key).update(data).digest(encoding).replace(/\/|\+|=/g, function(x) {
 				return {
 					"/": "_",
 					"+": "-",
@@ -20389,10 +20403,14 @@ var require_application = __commonJS({ "../../node_modules/koa/lib/application.j
 		}
 		if (Buffer.isBuffer(body)) return res.end(body);
 		if (typeof body === "string") return res.end(body);
-		if (body instanceof Blob) return Stream.Readable.from(body.stream()).pipe(res);
-		if (body instanceof ReadableStream) return Stream.Readable.from(body).pipe(res);
-		if (body instanceof Response) return Stream.Readable.from(body?.body || "").pipe(res);
-		if (isStream(body)) return body.pipe(res);
+		let stream = null;
+		if (body instanceof Blob) stream = Stream.Readable.from(body.stream());
+		else if (body instanceof ReadableStream) stream = Stream.Readable.from(body);
+		else if (body instanceof Response) stream = Stream.Readable.from(body?.body || "");
+		else if (isStream(body)) stream = body;
+		if (stream) return Stream.pipeline(stream, res, (err) => {
+			if (err && ctx.app.listenerCount("error")) ctx.onerror(err);
+		});
 		body = JSON.stringify(body);
 		if (!res.headersSent) ctx.length = Buffer.byteLength(body);
 		res.end(body);
@@ -20769,6 +20787,21 @@ Object.defineProperty(Emittery, "listenerRemoved", {
 	configurable: false
 });
 
+//#endregion
+//#region src/types.ts
+let MessageType = /* @__PURE__ */ function(MessageType$2) {
+	MessageType$2["System"] = "system";
+	MessageType$2["JoinGroup"] = "joinGroup";
+	MessageType$2["SendToGroup"] = "sendToGroup";
+	return MessageType$2;
+}({});
+let MessageDataType = /* @__PURE__ */ function(MessageDataType$2) {
+	MessageDataType$2["Init"] = "init";
+	MessageDataType$2["Sync"] = "sync";
+	MessageDataType$2["Awareness"] = "awareness";
+	return MessageDataType$2;
+}({});
+
 //#endregion
 //#region src/yjs.ts
 var yjs_default = Y$1;
@@ -22809,61 +22842,74 @@ const expirationTimeInMinutes = 60;
 const messageSync = 0;
 const messageAwareness = 1;
 const AzureWebPubSubJsonProtocol = "json.webpubsub.azure.v1";
-let MessageType = /* @__PURE__ */ function(MessageType$1) {
-	MessageType$1["System"] = "system";
-	MessageType$1["JoinGroup"] = "joinGroup";
-	MessageType$1["SendToGroup"] = "sendToGroup";
-	return MessageType$1;
+let MessageType$1 = /* @__PURE__ */ function(MessageType$2) {
+	MessageType$2["System"] = "system";
+	MessageType$2["JoinGroup"] = "joinGroup";
+	MessageType$2["SendToGroup"] = "sendToGroup";
+	return MessageType$2;
 }({});
-let MessageDataType = /* @__PURE__ */ function(MessageDataType$1) {
-	MessageDataType$1["Init"] = "init";
-	MessageDataType$1["Sync"] = "sync";
-	MessageDataType$1["Awareness"] = "awareness";
-	return MessageDataType$1;
+let MessageDataType$1 = /* @__PURE__ */ function(MessageDataType$2) {
+	MessageDataType$2["Init"] = "init";
+	MessageDataType$2["Sync"] = "sync";
+	MessageDataType$2["Awareness"] = "awareness";
+	return MessageDataType$2;
 }({});
 const HostUserId = "host";
 var WeaveStoreAzureWebPubSubSyncHost = class {
-	constructor(server, client, topic, doc) {
+	_reconnectAttempts = 0;
+	_forceClose = false;
+	constructor(server, syncHandler, client, topic, doc) {
 		this.server = server;
+		this.syncHandler = syncHandler;
 		this.doc = doc;
 		this.topic = topic;
 		this.topicAwarenessChannel = `${topic}-awareness`;
 		this._client = client;
 		this._conn = null;
 		this._awareness = new Awareness(this.doc);
-		this._awareness.setLocalState(null);
-		const awarenessUpdateHandler = ({ added, updated, removed }, origin) => {
-			const changedClients = added.concat(added, updated, removed);
-			const encoder = createEncoder();
-			writeVarUint(encoder, messageAwareness);
-			writeVarUint8Array(encoder, encodeAwarenessUpdate(this._awareness, changedClients));
-			const u8 = toUint8Array(encoder);
-			this.broadcast(this.topic, origin, u8);
+		this._awarenessUpdateHandler = ({ added, updated, removed }, origin) => {
+			try {
+				const changedClients = added.concat(added, updated, removed);
+				const encoder = createEncoder();
+				writeVarUint(encoder, messageAwareness);
+				const payload = encodeAwarenessUpdate(this._awareness, changedClients);
+				writeVarUint8Array(encoder, payload);
+				const u8 = toUint8Array(encoder);
+				this.broadcast(this.topic, origin, u8);
+			} catch (err) {
+				console.error("Error in awareness update handler:", err);
+			}
 		};
-		this._awareness.on("update", awarenessUpdateHandler);
-		const updateHandler = (update, origin) => {
-			const encoder = createEncoder();
-			writeVarUint(encoder, messageSync);
-			writeUpdate(encoder, update);
-			const u8 = toUint8Array(encoder);
-			this.broadcast(this.topic, origin, u8);
+		this._awareness.on("update", this._awarenessUpdateHandler);
+		this._updateHandler = (update, origin) => {
+			try {
+				const encoder = createEncoder();
+				writeVarUint(encoder, messageSync);
+				writeUpdate(encoder, update);
+				const u8 = toUint8Array(encoder);
+				this.broadcast(this.topic, origin, u8);
+				if (!this.syncHandler.isPersistingOnInterval()) this.syncHandler.persistRoomTask(this.topic);
+			} catch (err) {
+				console.error("Error in document update handler:", err);
+			}
 		};
-		this.doc.on("update", updateHandler);
+		this.doc.on("update", this._updateHandler);
 	}
 	get awareness() {
 		return this._awareness;
 	}
 	sendInitAwarenessInfo(origin) {
+		if (!this._awareness) return;
 		const encoderAwarenessState = createEncoder();
 		writeVarUint(encoderAwarenessState, messageAwareness);
 		writeVarUint8Array(encoderAwarenessState, encodeAwarenessUpdate(this._awareness, Array.from(this._awareness.getStates().keys())));
 		const u8 = toUint8Array(encoderAwarenessState);
 		this.broadcast(this.topic, origin, u8);
 	}
-	async createWebSocket(sleep = 0) {
+	async createWebSocket() {
 		const group = this.topic;
 		const { url: url$1 } = await this.negotiate(this.topic);
-		if (sleep && sleep > 0) await new Promise((resolve) => setTimeout(resolve, sleep));
+		this._reconnectAttempts++;
 		return new Promise((resolve) => {
 			const ws = new WebSocket(url$1, AzureWebPubSubJsonProtocol);
 			ws.addEventListener("open", (event) => {
@@ -22872,7 +22918,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 					event
 				});
 				ws.send(JSON.stringify({
-					type: MessageType.JoinGroup,
+					type: MessageType$1.JoinGroup,
 					group: `${group}.host`
 				}));
 				this.server.emitEvent("onWsJoinGroup", { group: `${group}.host` });
@@ -22886,15 +22932,15 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 				});
 				const event = JSON.parse(e.data.toString());
 				if (event.type === "message" && event.from === "group") switch (event.data.t) {
-					case MessageDataType.Init:
+					case MessageDataType$1.Init:
 						this.onClientInit(group, event.data);
 						this.onClientSync(group, event.data);
 						this.sendInitAwarenessInfo(event.data.f);
 						return;
-					case MessageDataType.Sync:
+					case MessageDataType$1.Sync:
 						this.onClientSync(group, event.data);
 						return;
-					case MessageDataType.Awareness:
+					case MessageDataType$1.Awareness:
 						this.onAwareness(group, event.data);
 						return;
 				}
@@ -22904,9 +22950,12 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 					group: `${group}.host`,
 					event: e
 				});
-				if (e.code === 1008 && ws.readyState === WebSocket.OPEN) {
-					ws.close();
-					this.createWebSocket();
+				if (this._forceClose) return;
+				else {
+					const timeout = 1e3 * Math.pow(1.5, this._reconnectAttempts);
+					setTimeout(() => {
+						this.createWebSocket();
+					}, timeout);
 				}
 			});
 			ws.addEventListener("error", (error) => {
@@ -22915,7 +22964,6 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 					error
 				});
 				if (ws.readyState === WebSocket.OPEN) ws.close();
-				this.createWebSocket(2e4);
 			});
 			setTimeout(() => {
 				if (ws.readyState === WebSocket.OPEN) {
@@ -22930,6 +22978,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 		await this.createWebSocket();
 	}
 	async stop() {
+		this._forceClose = true;
 		if (this._conn?.readyState === WebSocket.OPEN) {
 			this._conn?.close();
 			this._conn = null;
@@ -22948,30 +22997,38 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 		return true;
 	}
 	broadcast(group, from$1, u8) {
-		const payload = JSON.stringify({
-			type: MessageType.SendToGroup,
-			group,
-			noEcho: true,
-			data: {
-				f: from$1,
-				c: Buffer.from(u8).toString("base64")
-			}
-		});
-		if (!this.safeSend(payload)) return;
-		this._conn?.send?.(payload);
+		try {
+			const payload = JSON.stringify({
+				type: MessageType$1.SendToGroup,
+				group,
+				noEcho: true,
+				data: {
+					f: from$1,
+					c: Buffer.from(u8).toString("base64")
+				}
+			});
+			if (!this.safeSend(payload)) return;
+			this._conn?.send?.(payload);
+		} catch (ex) {
+			console.error("Error broadcasting message:", ex);
+		}
 	}
 	send(group, to, u8) {
-		const payload = JSON.stringify({
-			type: MessageType.SendToGroup,
-			group,
-			noEcho: true,
-			data: {
-				t: to,
-				c: Buffer.from(u8).toString("base64")
-			}
-		});
-		if (!this.safeSend(payload)) return;
-		this._conn?.send?.(payload);
+		try {
+			const payload = JSON.stringify({
+				type: MessageType$1.SendToGroup,
+				group,
+				noEcho: true,
+				data: {
+					t: to,
+					c: Buffer.from(u8).toString("base64")
+				}
+			});
+			if (!this.safeSend(payload)) return;
+			this._conn?.send?.(payload);
+		} catch (ex) {
+			console.error("Error sending message:", ex);
+		}
 	}
 	onClientInit(group, data) {
 		const encoder = createEncoder();
@@ -23003,6 +23060,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 			const decoder = createDecoder(buf);
 			readVarUint(decoder);
 			const update = readVarUint8Array(decoder);
+			if (!this._awareness) return;
 			applyAwarenessUpdate(this._awareness, update, void 0);
 		} catch (err) {
 			this.doc.emit("error", [err]);
@@ -23023,12 +23081,27 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 	}
 };
 
+//#endregion
+//#region src/server/utils.ts
+function getStateAsJson(actualState) {
+	const document = new yjs_default.Doc();
+	yjs_default.applyUpdate(document, actualState);
+	const actualStateString = JSON.stringify(document.getMap("weave").toJSON());
+	const actualStateJson = JSON.parse(actualStateString);
+	return actualStateJson;
+}
+function hashJson(obj) {
+	const jsonString = JSON.stringify(obj);
+	return crypto.createHash("sha256").update(jsonString).digest("hex");
+}
+
 //#endregion
 //#region src/server/azure-web-pubsub-sync-handler.ts
 var WeaveAzureWebPubsubSyncHandler = class extends WebPubSubEventHandler {
 	_rooms = new Map();
 	_roomsSyncHost = new Map();
 	_store_persistence = new Map();
+	roomsLastState = new Map();
 	constructor(hub, server, client, initialState, syncHandlerOptions, eventHandlerOptions) {
 		super(hub, {
 			...eventHandlerOptions,
@@ -23053,6 +23126,7 @@ var WeaveAzureWebPubsubSyncHandler = class extends WebPubSubEventHandler {
 		this.server = server;
 		this.initialState = initialState;
 		this._client = client;
+		if (this.isPersistingOnInterval()) console.warn(`Room persistence defined via interval, be aware that this can lead to data loss. Consider persisting on document updates instead.`);
 	}
 	getNewYDoc() {
 		return new yjs_default.Doc();
@@ -23064,29 +23138,44 @@ var WeaveAzureWebPubsubSyncHandler = class extends WebPubSubEventHandler {
 		if (this.server?.fetchRoom) documentData = await this.server.fetchRoom(roomId);
 		if (documentData) yjs_default.applyUpdate(doc, documentData);
 		else this.initialState(doc);
-		this._roomsSyncHost.set(roomId, new WeaveStoreAzureWebPubSubSyncHost(this.server, this._client, roomId, doc));
+		this._roomsSyncHost.set(roomId, new WeaveStoreAzureWebPubSubSyncHost(this.server, this, this._client, roomId, doc));
 		const connection = this._roomsSyncHost.get(roomId);
 		await connection.start();
-		await this.setupRoomInstancePersistence(roomId);
+		if (this.isPersistingOnInterval()) this.setupRoomInstancePersistence(roomId);
+	}
+	isPersistingOnInterval() {
+		return this.syncOptions?.persistIntervalMs !== void 0;
+	}
+	async setupRoomInstancePersistence(roomId) {
+		if (!this._store_persistence.has(roomId)) {
+			const intervalId = setInterval(async () => {
+				await this.persistRoomTask(roomId);
+			}, this.syncOptions?.persistIntervalMs ?? 5e3);
+			this._store_persistence.set(roomId, intervalId);
+		}
 	}
 	async persistRoomTask(roomId) {
 		try {
 			const doc = this._rooms.get(roomId);
 			if (!doc) return;
 			const actualState = yjs_default.encodeStateAsUpdate(doc);
+			if (!this.isPersistingOnInterval()) {
+				const savedRoomData = this.roomsLastState.get(roomId);
+				if (savedRoomData) {
+					const savedStateJson = getStateAsJson(savedRoomData);
+					const savedHash = hashJson(savedStateJson);
+					const actualStateJson = getStateAsJson(actualState);
+					const actualHash = hashJson(actualStateJson);
+					const same = savedHash === actualHash;
+					if (same) return;
+					this.roomsLastState.set(roomId, actualState);
+				}
+			}
 			if (this.server?.persistRoom) await this.server.persistRoom(roomId, actualState);
 		} catch (ex) {
 			console.error(ex);
 		}
 	}
-	async setupRoomInstancePersistence(roomId) {
-		if (!this._store_persistence.has(roomId)) {
-			const intervalId = setInterval(async () => {
-				await this.persistRoomTask(roomId);
-			}, this.syncOptions?.persistIntervalMs ?? 5e3);
-			this._store_persistence.set(roomId, intervalId);
-		}
-	}
 	async handleConnectionDisconnection(connectionId) {
 		const connectionRoom = await this.syncOptions?.getConnectionRoom?.(connectionId);
 		if (connectionRoom) await this.syncOptions?.removeConnection?.(connectionId);
@@ -23094,10 +23183,13 @@ var WeaveAzureWebPubsubSyncHandler = class extends WebPubSubEventHandler {
 		if (connectionRoom && roomConnections?.length === 0) await this.destroyRoomInstance(connectionRoom);
 	}
 	async destroyRoomInstance(roomId) {
-		const intervalId = this._store_persistence.get(roomId);
-		if (intervalId) clearInterval(intervalId);
-		this._store_persistence.delete(roomId);
+		if (this.isPersistingOnInterval()) {
+			const intervalId = this._store_persistence.get(roomId);
+			if (intervalId) clearInterval(intervalId);
+			this._store_persistence.delete(roomId);
+		}
 		await this.persistRoomTask(roomId);
+		if (!this.isPersistingOnInterval()) this.roomsLastState.delete(roomId);
 		const syncHost = this._roomsSyncHost.get(roomId);
 		if (syncHost) {
 			await syncHost.stop();
@@ -23114,11 +23206,12 @@ var WeaveAzureWebPubsubSyncHandler = class extends WebPubSubEventHandler {
 	getRoomSyncHost(roomId) {
 		return this._roomsSyncHost.get(roomId);
 	}
-	async clientConnect(roomId) {
+	async clientConnect(roomId, connectionOptions) {
 		await this.getHostConnection(roomId);
 		const token = await this._client.getClientAccessToken({
 			groups: [roomId],
-			roles: [`webpubsub.joinLeaveGroup.${roomId}`, `webpubsub.sendToGroup.${roomId}.host`]
+			roles: [`webpubsub.joinLeaveGroup.${roomId}`, `webpubsub.sendToGroup.${roomId}.host`],
+			...connectionOptions
 		});
 		const finalURL = `${token.url}&group=${roomId}`;
 		return finalURL;
@@ -23143,7 +23236,7 @@ var WeaveAzureWebPubsubServer = class extends Emittery {
 		credentials ??= new DefaultAzureCredential();
 		this.syncClient = new WebPubSubServiceClient(pubSubConfig.endpoint, credentials, pubSubConfig.hubName);
 		this.syncHandler = new WeaveAzureWebPubsubSyncHandler(pubSubConfig.hubName, this, this.syncClient, initialState, {
-			persistIntervalMs: pubSubConfig.persistIntervalMs,
+			...pubSubConfig.persistIntervalMs && { persistIntervalMs: pubSubConfig.persistIntervalMs },
 			...pubSubConfig.connectionHandlers
 		}, eventsHandlerConfig);
 	}
@@ -23165,14 +23258,20 @@ var WeaveAzureWebPubsubServer = class extends Emittery {
 	removeEventListener(event, callback) {
 		this.off(event, callback);
 	}
-	async clientConnect(roomId) {
-		return await this.syncHandler.clientConnect(roomId);
+	async clientConnect(roomId, connectionOptions) {
+		return await this.syncHandler.clientConnect(roomId, connectionOptions);
 	}
 };
 
 //#endregion
 //#region src/constants.ts
 const WEAVE_STORE_AZURE_WEB_PUBSUB = "store-azure-web-pubsub";
+const WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS = {
+	["CONNECTING"]: "connecting",
+	["CONNECTED"]: "connected",
+	["DISCONNECTED"]: "disconnected",
+	["ERROR"]: "error"
+};
 const WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE = {
 	["PUB"]: "pub",
 	["SUB"]: "sub"
@@ -23180,4 +23279,4 @@ const WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE = {
 const WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG = { resyncIntervalMs: 15e3 };
 
 //#endregion
-export { MqttDisconnectReasonCode, MqttV311ConnectReturnCode, MqttV500ConnectReasonCode, WEAVE_STORE_AZURE_WEB_PUBSUB, WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubServer, WeaveStoreAzureWebPubSubSyncHost, WebPubSubEventHandler };
+export { MessageDataType, MessageType, MqttDisconnectReasonCode, MqttV311ConnectReturnCode, MqttV500ConnectReasonCode, WEAVE_STORE_AZURE_WEB_PUBSUB, WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS, WEAVE_STORE_AZURE_WEB_PUBSUB_DEFAULT_CONFIG, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubServer, WeaveStoreAzureWebPubSubSyncHost, WebPubSubEventHandler };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inditextech/weave-store-azure-web-pubsub",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "type": "module",
   "license": "Apache-2.0",
   "author": "Jesus Manuel Piñeiro Cid <jesusmpc@inditex.com>",
@@ -57,8 +57,8 @@
   "dependencies": {
     "@azure/identity": "4.10.2",
     "@azure/web-pubsub": "1.2.0",
-    "@inditextech/weave-types": "2.0.2",
-    "@inditextech/weave-sdk": "2.0.2",
+    "@inditextech/weave-types": "2.1.0",
+    "@inditextech/weave-sdk": "2.1.0",
     "@syncedstore/core": "0.6.0",
     "buffer": "6.0.3",
     "reconnecting-websocket": "4.4.0",