@inditextech/weave-store-azure-web-pubsub 0.7.1 → 0.8.0

package/dist/client.cjs

@@ -53,6 +53,15 @@ const min = (a, b) => a < b ? a : b;
 const max = (a, b) => a > b ? a : b;
 const isNaN$1 = Number.isNaN;
 
+//#endregion
+//#region ../../node_modules/lib0/time.js
+/**
+* Return current unix time.
+*
+* @return {number}
+*/
+const getUnixTime = Date.now;
+
 //#endregion
 //#region ../../node_modules/lib0/binary.js
 const BIT8 = 128;
@@ -607,15 +616,6 @@ const readSyncMessage = (decoder, encoder, doc, transactionOrigin) => {
 	return messageType;
 };
 
-//#endregion
-//#region ../../node_modules/lib0/time.js
-/**
-* Return current unix time.
-*
-* @return {number}
-*/
-const getUnixTime = Date.now;
-
 //#endregion
 //#region ../../node_modules/lib0/map.js
 /**
@@ -1042,6 +1042,7 @@ const messageSyncStep1 = 0;
 const messageAwareness = 1;
 const messageQueryAwareness = 3;
 const AzureWebPubSubJsonProtocol = "json.webpubsub.azure.v1";
+const messageReconnectTimeout = 3e4;
 let MessageType = /* @__PURE__ */ function(MessageType$1) {
 	MessageType$1["System"] = "system";
 	MessageType$1["JoinGroup"] = "joinGroup";
@@ -1143,6 +1144,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends emittery.default {
 		return this._uuid;
 	}
 	destroy() {
+		if (this._checkInterval !== null) clearInterval(this._checkInterval);
 		if (this._resyncInterval !== null) clearInterval(this._resyncInterval);
 		this.stop();
 		this.doc.off("update", this._updateHandler);
@@ -1178,7 +1180,11 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends emittery.default {
 		this.synced = false;
 		this._status = "connecting";
 		this.emit("status", this._status);
+		this._checkInterval = setInterval(() => {
+			if (this._ws?.OPEN && messageReconnectTimeout < getUnixTime() - this._wsLastMessageReceived) this._ws.reconnect();
+		}, messageReconnectTimeout / 10);
 		websocket.onmessage = (event) => {
+			this._wsLastMessageReceived = getUnixTime();
 			if (event.data === null) return;
 			const message = JSON.parse(event.data.toString());
 			if (message.type === MessageType.System) return;
@@ -1189,6 +1195,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends emittery.default {
 			if (length$1(encoder) > 1) sendToControlGroup(this, this.topic, MessageDataType.Sync, toUint8Array(encoder));
 		};
 		websocket.onclose = () => {
+			console.error("Websocket closed");
 			this._ws = null;
 			if (this._wsConnected) {
 				this._status = "disconnected";
@@ -1199,9 +1206,10 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends emittery.default {
 			}
 		};
 		websocket.onerror = (err) => {
-			console.error(err);
+			console.error("Websocket error", err);
 		};
 		websocket.onopen = () => {
+			console.error("Websocket open");
 			this._wsConnected = true;
 			this._status = "connected";
 			this.emit("status", this._status);
@@ -1257,7 +1265,23 @@ var WeaveStoreAzureWebPubsub = class extends __inditextech_weave_sdk.WeaveStore
 			resyncInterval: 1e3,
 			tokenProvider: null
 		});
+		window.addEventListener("beforeunload", () => {
+			const awareness = this.provider.awareness;
+			awareness.destroy();
+		});
 		this.provider.on("status", (status) => {
+			if (status === "connected") {
+				this.handleAwarenessChange();
+				const awareness = this.provider.awareness;
+				awareness.on("update", this.handleAwarenessChange.bind(this));
+				awareness.on("change", this.handleAwarenessChange.bind(this));
+			}
+			if (status === "disconnected") {
+				const awareness = this.provider.awareness;
+				awareness.destroy();
+				awareness.off("update", this.handleAwarenessChange.bind(this));
+				awareness.off("change", this.handleAwarenessChange.bind(this));
+			}
 			this.azureWebPubsubOptions.callbacks?.onConnectionStatusChange?.(status);
 			this.instance.emitEvent("onConnectionStatusChange", status);
 		});
@@ -1290,19 +1314,21 @@ var WeaveStoreAzureWebPubsub = class extends __inditextech_weave_sdk.WeaveStore
 		await this.provider.start();
 	}
 	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();
 	}
-	setAwarenessInfo(field, value) {
+	handleAwarenessChange(emit = true) {
 		const awareness = this.provider.awareness;
-		awareness.setLocalStateField(field, value);
+		const values = Array.from(awareness.getStates().values());
+		values.splice(awareness.clientID, 1);
+		if (emit) this.instance.emitEvent("onAwarenessChange", values);
 	}
-	onAwarenessChange(callback) {
+	setAwarenessInfo(field, value) {
 		const awareness = this.provider.awareness;
-		awareness.on("change", () => {
-			const values = Array.from(awareness.getStates().values());
-			values.splice(awareness.clientID, 1);
-			callback(values);
-		});
+		awareness.setLocalStateField(field, value);
 	}
 };
 

package/dist/client.d.cts

@@ -15,7 +15,6 @@ type WeaveStoreOptions = {
   getUser: () => WeaveUser;
   undoManagerOptions?: WeaveUndoManagerOptions;
 };
-type WeaveAwarenessChange<K extends string, T> = { [key in K]: T };
 type WeaveUser = {
   [key: string]: any;
   name: string;
@@ -74,6 +73,8 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   private _status;
   private _wsConnected;
   private _synced;
+  private _wsLastMessageReceived;
+  private _checkInterval;
   private _resyncInterval;
   private _uuid;
   private _awareness;
@@ -106,12 +107,13 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   protected provider: WeaveStoreAzureWebPubSubSyncClient;
   protected name: string;
   protected supportsUndoManager: boolean;
+  protected awarenessCallback: (changes: any) => void;
   constructor(storeOptions: WeaveStoreOptions, azureWebPubsubOptions: WeaveStoreAzureWebPubsubOptions);
   private init;
   connect(): Promise<void>;
   disconnect(): void;
+  handleAwarenessChange(emit?: boolean): void;
   setAwarenessInfo(field: string, value: unknown): void;
-  onAwarenessChange<K extends string, T>(callback: (changes: WeaveAwarenessChange<K, T>[]) => void): void;
 }
 
 //#endregion

package/dist/client.d.ts

@@ -15,7 +15,6 @@ type WeaveStoreOptions = {
   getUser: () => WeaveUser;
   undoManagerOptions?: WeaveUndoManagerOptions;
 };
-type WeaveAwarenessChange<K extends string, T> = { [key in K]: T };
 type WeaveUser = {
   [key: string]: any;
   name: string;
@@ -74,6 +73,8 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   private _status;
   private _wsConnected;
   private _synced;
+  private _wsLastMessageReceived;
+  private _checkInterval;
   private _resyncInterval;
   private _uuid;
   private _awareness;
@@ -106,12 +107,13 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   protected provider: WeaveStoreAzureWebPubSubSyncClient;
   protected name: string;
   protected supportsUndoManager: boolean;
+  protected awarenessCallback: (changes: any) => void;
   constructor(storeOptions: WeaveStoreOptions, azureWebPubsubOptions: WeaveStoreAzureWebPubsubOptions);
   private init;
   connect(): Promise<void>;
   disconnect(): void;
+  handleAwarenessChange(emit?: boolean): void;
   setAwarenessInfo(field: string, value: unknown): void;
-  onAwarenessChange<K extends string, T>(callback: (changes: WeaveAwarenessChange<K, T>[]) => void): void;
 }
 
 //#endregion

package/dist/client.js

@@ -30,6 +30,15 @@ const min = (a, b) => a < b ? a : b;
 const max = (a, b) => a > b ? a : b;
 const isNaN$1 = Number.isNaN;
 
+//#endregion
+//#region ../../node_modules/lib0/time.js
+/**
+* Return current unix time.
+*
+* @return {number}
+*/
+const getUnixTime = Date.now;
+
 //#endregion
 //#region ../../node_modules/lib0/binary.js
 const BIT8 = 128;
@@ -584,15 +593,6 @@ const readSyncMessage = (decoder, encoder, doc, transactionOrigin) => {
 	return messageType;
 };
 
-//#endregion
-//#region ../../node_modules/lib0/time.js
-/**
-* Return current unix time.
-*
-* @return {number}
-*/
-const getUnixTime = Date.now;
-
 //#endregion
 //#region ../../node_modules/lib0/map.js
 /**
@@ -1019,6 +1019,7 @@ const messageSyncStep1 = 0;
 const messageAwareness = 1;
 const messageQueryAwareness = 3;
 const AzureWebPubSubJsonProtocol = "json.webpubsub.azure.v1";
+const messageReconnectTimeout = 3e4;
 let MessageType = /* @__PURE__ */ function(MessageType$1) {
 	MessageType$1["System"] = "system";
 	MessageType$1["JoinGroup"] = "joinGroup";
@@ -1120,6 +1121,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 		return this._uuid;
 	}
 	destroy() {
+		if (this._checkInterval !== null) clearInterval(this._checkInterval);
 		if (this._resyncInterval !== null) clearInterval(this._resyncInterval);
 		this.stop();
 		this.doc.off("update", this._updateHandler);
@@ -1155,7 +1157,11 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 		this.synced = false;
 		this._status = "connecting";
 		this.emit("status", this._status);
+		this._checkInterval = setInterval(() => {
+			if (this._ws?.OPEN && messageReconnectTimeout < getUnixTime() - this._wsLastMessageReceived) this._ws.reconnect();
+		}, messageReconnectTimeout / 10);
 		websocket.onmessage = (event) => {
+			this._wsLastMessageReceived = getUnixTime();
 			if (event.data === null) return;
 			const message = JSON.parse(event.data.toString());
 			if (message.type === MessageType.System) return;
@@ -1166,6 +1172,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			if (length$1(encoder) > 1) sendToControlGroup(this, this.topic, MessageDataType.Sync, toUint8Array(encoder));
 		};
 		websocket.onclose = () => {
+			console.error("Websocket closed");
 			this._ws = null;
 			if (this._wsConnected) {
 				this._status = "disconnected";
@@ -1176,9 +1183,10 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			}
 		};
 		websocket.onerror = (err) => {
-			console.error(err);
+			console.error("Websocket error", err);
 		};
 		websocket.onopen = () => {
+			console.error("Websocket open");
 			this._wsConnected = true;
 			this._status = "connected";
 			this.emit("status", this._status);
@@ -1234,7 +1242,23 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 			resyncInterval: 1e3,
 			tokenProvider: null
 		});
+		window.addEventListener("beforeunload", () => {
+			const awareness = this.provider.awareness;
+			awareness.destroy();
+		});
 		this.provider.on("status", (status) => {
+			if (status === "connected") {
+				this.handleAwarenessChange();
+				const awareness = this.provider.awareness;
+				awareness.on("update", this.handleAwarenessChange.bind(this));
+				awareness.on("change", this.handleAwarenessChange.bind(this));
+			}
+			if (status === "disconnected") {
+				const awareness = this.provider.awareness;
+				awareness.destroy();
+				awareness.off("update", this.handleAwarenessChange.bind(this));
+				awareness.off("change", this.handleAwarenessChange.bind(this));
+			}
 			this.azureWebPubsubOptions.callbacks?.onConnectionStatusChange?.(status);
 			this.instance.emitEvent("onConnectionStatusChange", status);
 		});
@@ -1267,19 +1291,21 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 		await this.provider.start();
 	}
 	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();
 	}
-	setAwarenessInfo(field, value) {
+	handleAwarenessChange(emit = true) {
 		const awareness = this.provider.awareness;
-		awareness.setLocalStateField(field, value);
+		const values = Array.from(awareness.getStates().values());
+		values.splice(awareness.clientID, 1);
+		if (emit) this.instance.emitEvent("onAwarenessChange", values);
 	}
-	onAwarenessChange(callback) {
+	setAwarenessInfo(field, value) {
 		const awareness = this.provider.awareness;
-		awareness.on("change", () => {
-			const values = Array.from(awareness.getStates().values());
-			values.splice(awareness.clientID, 1);
-			callback(values);
-		});
+		awareness.setLocalStateField(field, value);
 	}
 };
 

package/dist/server.cjs

@@ -1060,7 +1060,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 		this._awareness = new Awareness(this.doc);
 		this._awareness.setLocalState(null);
 		const awarenessUpdateHandler = ({ added, updated, removed }) => {
-			const changedClients = added.concat(updated, removed);
+			const changedClients = added.concat(added, updated, removed);
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageAwareness);
 			writeVarUint8Array(encoder, encodeAwarenessUpdate(this._awareness, changedClients));
@@ -1080,6 +1080,13 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 	get awareness() {
 		return this._awareness;
 	}
+	sendInitAwarenessInfo() {
+		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, u8);
+	}
 	async start() {
 		const url = await this.negotiate(this.topic);
 		const conn = new this._polyfill(url, "json.webpubsub.azure.v1");
@@ -1090,6 +1097,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 				case MessageDataType.Init:
 					this.onClientInit(group, event.data);
 					this.onClientSync(group, event.data);
+					this.sendInitAwarenessInfo();
 					return;
 				case MessageDataType.Sync:
 					this.onClientSync(group, event.data);

package/dist/server.js

@@ -1038,7 +1038,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 		this._awareness = new Awareness(this.doc);
 		this._awareness.setLocalState(null);
 		const awarenessUpdateHandler = ({ added, updated, removed }) => {
-			const changedClients = added.concat(updated, removed);
+			const changedClients = added.concat(added, updated, removed);
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageAwareness);
 			writeVarUint8Array(encoder, encodeAwarenessUpdate(this._awareness, changedClients));
@@ -1058,6 +1058,13 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 	get awareness() {
 		return this._awareness;
 	}
+	sendInitAwarenessInfo() {
+		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, u8);
+	}
 	async start() {
 		const url = await this.negotiate(this.topic);
 		const conn = new this._polyfill(url, "json.webpubsub.azure.v1");
@@ -1068,6 +1075,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 				case MessageDataType.Init:
 					this.onClientInit(group, event.data);
 					this.onClientSync(group, event.data);
+					this.sendInitAwarenessInfo();
 					return;
 				case MessageDataType.Sync:
 					this.onClientSync(group, event.data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inditextech/weave-store-azure-web-pubsub",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "type": "module",
   "license": "Apache-2.0",
   "author": "Jesus Manuel Piñeiro Cid <jesusmpc@inditex.com>",
@@ -62,7 +62,7 @@
     "yjs": "13.6.26"
   },
   "devDependencies": {
-    "@inditextech/weave-sdk": "0.7.1",
+    "@inditextech/weave-sdk": "0.8.0",
     "@types/express": "^5.0.1",
     "@types/node": "^22.15.3",
     "@types/uuid": "^10.0.0",