@inditextech/weave-store-azure-web-pubsub 3.3.1-SNAPSHOT.74.1 → 3.3.1

package/dist/client.d.ts

@@ -274,6 +274,7 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   createWebSocket(connectionUrlExtraParams?: Record<string, string>): Promise<ReconnectingWebSocket>;
   setAndEmitStatusInfo(status: WeaveStoreAzureWebPubSubSyncClientConnectionStatus): void;
   private setupCheckHeartbeat;
+  private destroyCheckHeartbeat;
   connect(connectionUrlExtraParams?: Record<string, string>): Promise<void>;
 }
 

package/dist/client.js

@@ -3918,7 +3918,9 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 					connectionURL.searchParams.append(key, connectionUrlExtraParams[key]);
 				}
 			}
-			const res = await this._fetchClient(connectionURL.toString());
+			const controller = new AbortController();
+			const timeout = setTimeout(() => controller.abort(), 5e3);
+			const res = await this._fetchClient(connectionURL.toString(), { signal: controller.signal }).finally(() => clearTimeout(timeout));
 			if (res.ok) {
 				const data = await res.json();
 				return data.url;
@@ -3946,6 +3948,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 					error
 				});
 			}
+			console.log("🔌 [Azure Web PubSub] connecting", url);
 			return url;
 		}, AzureWebPubSubJsonProtocol);
 		websocket.binaryType = "arraybuffer";
@@ -3954,7 +3957,8 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 		this._initialized = false;
 		this.synced = false;
 		websocket.addEventListener("error", (e) => {
-			console.error("WebSocket error", e);
+			console.error("❌ client error", e);
+			this.destroyCheckHeartbeat();
 			if (this._initialized && websocket.retryCount > 0) {
 				this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.CONNECTING);
 				return;
@@ -3967,6 +3971,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			if (message.type === MessageType.System) return;
 			const messageData = message.data;
 			if (messageData.type === "heartbeat") {
+				console.log("[Azure Web PubSub] received heartbeat, updating last heartbeat time.");
 				this._lastHeartbeatTime = Date.now();
 				return;
 			}
@@ -3985,8 +3990,9 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			const encoder = readMessage(this, buffer, true, messageData.f);
 			if (length(encoder) > 1) sendToControlGroup(this, this.topic, MessageDataType.Sync, toUint8Array(encoder));
 		};
-		websocket.onclose = () => {
-			if (this._checkHeartbeatId) clearInterval(this._checkHeartbeatId);
+		websocket.onclose = (e) => {
+			console.log(`🚫 [Azure Web PubSub] closed, code: ${e.code}`);
+			this.destroyCheckHeartbeat();
 			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) {
@@ -4000,8 +4006,11 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			this._wsConnected = true;
 			this._initialized = true;
 			this._connectionRetries = this._connectionRetries++;
+			console.log("✅ [Azure Web PubSub] connected");
 			this.setupCheckHeartbeat();
+			console.log(`🔌 [Azure Web PubSub] join room <${this.topic}>`);
 			joinGroup(this, this.topic);
+			console.log(`✅ [Azure Web PubSub] room <${this.topic}> joined`);
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageSyncStep1);
 			writeSyncStep1(encoder, this.doc);
@@ -4033,11 +4042,16 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 		this._checkHeartbeatId = setInterval(() => {
 			const now = Date.now();
 			if (now - this._lastHeartbeatTime > this._synClientOptions.heartbeat.checkWindowTimeMs) {
+				console.log(`[Azure Web PubSub] heartbeat not received in ${this._synClientOptions.heartbeat.checkWindowTimeMs}ms window, handling it...`);
 				this.disconnect();
 				this.createWebSocket();
 			}
 		}, this._synClientOptions.heartbeat.checkIntervalMs);
 	}
+	destroyCheckHeartbeat() {
+		this._lastHeartbeatTime = 0;
+		if (this._checkHeartbeatId) clearInterval(this._checkHeartbeatId);
+	}
 	async connect(connectionUrlExtraParams) {
 		if (this._wsConnected || this._ws) return;
 		await this.createWebSocket(connectionUrlExtraParams);
@@ -4153,7 +4167,6 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 		});
 		this.provider.on("error", () => {
 			this.handleConnectionStatusChange(WEAVE_STORE_CONNECTION_STATUS.DISCONNECTED);
-			this.disconnect();
 		});
 		this.provider.on("status", (status) => {
 			this.handleConnectionStatusChange(status);

package/dist/server.d.ts

@@ -105,6 +105,7 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   createWebSocket(connectionUrlExtraParams?: Record<string, string>): Promise<ReconnectingWebSocket>;
   setAndEmitStatusInfo(status: WeaveStoreAzureWebPubSubSyncClientConnectionStatus): void;
   private setupCheckHeartbeat;
+  private destroyCheckHeartbeat;
   connect(connectionUrlExtraParams?: Record<string, string>): Promise<void>;
 }
 
@@ -1039,6 +1040,7 @@ declare class WeaveStoreAzureWebPubSubSyncHost {
   private _chunkedMessages;
   private readonly _syncHostOptions;
   private _heartbeatIntervalId;
+  private _reconnectionTimeoutId;
   private _resyncAttempt;
   private _resyncIntervalId;
   private _updateHandler;
@@ -1050,6 +1052,7 @@ declare class WeaveStoreAzureWebPubSubSyncHost {
   createWebSocket(): Promise<void>;
   start(): Promise<void>;
   isConnected(): boolean;
+  isReconnecting(): boolean;
   stop(): Promise<void>;
   simulateWebsocketError(): void;
   private safeSend;
@@ -1089,6 +1092,9 @@ declare class WeaveAzureWebPubsubSyncHandler extends WebPubSubEventHandler {
   getRoomSyncHost(roomId: string): WeaveStoreAzureWebPubSubSyncHost | undefined;
   getRoomDocument(roomId: string): Promise<Y.Doc>;
   clientConnect(roomId: string, connectionOptions?: WeaveStoreAzureWebPubSubSyncHostClientConnectOptions): Promise<string>;
+  clientDisconnect(roomId: string): Promise<void>;
+  clientTransportConnect(roomId: string): Promise<void>;
+  clientTransportDisconnect(roomId: string): void;
 }
 
 //#endregion
@@ -1122,6 +1128,9 @@ declare class WeaveAzureWebPubsubServer extends Emittery {
   removeEventListener<T>(event: string, callback: (payload: T) => void): void;
   getRoomDocument(roomId: string): Promise<Y.Doc>;
   clientConnect(roomId: string, connectionOptions?: WeaveStoreAzureWebPubSubSyncHostClientConnectOptions): Promise<string | null>;
+  clientDisconnect(roomId: string): Promise<void>;
+  clientTransportConnect(roomId: string): Promise<void>;
+  clientTransportDisconnect(roomId: string): void;
 }
 
 //#endregion

package/dist/server.js

@@ -22723,6 +22723,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 		this._client = client;
 		this._chunkedMessages = new Map();
 		this._heartbeatIntervalId = null;
+		this._reconnectionTimeoutId = null;
 		this._conn = null;
 		this._awareness = new Awareness(this.doc);
 		this._awarenessUpdateHandler = ({ added, updated, removed }, origin) => {
@@ -22850,13 +22851,13 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 				if (this._forceClose) return;
 				else {
 					this._reconnectAttempts++;
-					const timeoutMs = 1e3 * Math.pow(1.5, this._reconnectAttempts - 1);
+					const timeoutMs = Math.round(1e3 * Math.pow(1.5, this._reconnectAttempts - 1));
 					this.server.emitEvent("onWsReconnect", {
 						group: `${group}.host`,
 						connectionAttempt: this._reconnectAttempts,
 						timeoutMs
 					});
-					setTimeout(() => {
+					this._reconnectionTimeoutId = setTimeout(() => {
 						this.createWebSocket();
 					}, timeoutMs);
 				}
@@ -22874,12 +22875,19 @@ var WeaveStoreAzureWebPubSubSyncHost = class {
 		});
 	}
 	async start() {
+		this._forceClose = false;
+		this._reconnectAttempts = 0;
+		if (this._reconnectionTimeoutId) clearTimeout(this._reconnectionTimeoutId);
 		await this.createWebSocket();
 	}
 	isConnected() {
 		return this._conn && this._conn.readyState === WebSocket.OPEN;
 	}
+	isReconnecting() {
+		return this._reconnectionTimeoutId !== null;
+	}
 	async stop() {
+		this._reconnectAttempts = 0;
 		this._forceClose = true;
 		if (this._conn?.readyState === WebSocket.OPEN) {
 			this._conn?.close();
@@ -23179,6 +23187,7 @@ var WeaveAzureWebPubsubSyncHandler = class extends WebPubSubEventHandler {
 	}
 	async getHostConnection(roomId) {
 		if (!this._rooms.has(roomId)) await this.setupRoomInstance(roomId);
+		if (this._rooms.has(roomId) && !this._roomsSyncHost.get(roomId)?.isConnected() && !this._roomsSyncHost.get(roomId)?.isReconnecting()) await this._roomsSyncHost.get(roomId)?.start();
 	}
 	getRoomsLoaded() {
 		return Array.from(this._rooms.keys());
@@ -23200,6 +23209,18 @@ var WeaveAzureWebPubsubSyncHandler = class extends WebPubSubEventHandler {
 		const finalURL = `${token.url}&group=${roomId}`;
 		return finalURL;
 	}
+	async clientDisconnect(roomId) {
+		const roomSyncHost = this._roomsSyncHost.get(roomId);
+		if (roomSyncHost) await this.destroyRoomInstance(roomId);
+	}
+	async clientTransportConnect(roomId) {
+		const roomSyncHost = this._roomsSyncHost.get(roomId);
+		if (roomSyncHost) await roomSyncHost.start();
+	}
+	clientTransportDisconnect(roomId) {
+		const roomSyncHost = this._roomsSyncHost.get(roomId);
+		if (roomSyncHost) roomSyncHost.stop();
+	}
 };
 
 //#endregion
@@ -23248,6 +23269,15 @@ var WeaveAzureWebPubsubServer = class extends Emittery {
 	async clientConnect(roomId, connectionOptions) {
 		return await this.syncHandler.clientConnect(roomId, connectionOptions);
 	}
+	async clientDisconnect(roomId) {
+		await this.syncHandler.clientDisconnect(roomId);
+	}
+	async clientTransportConnect(roomId) {
+		await this.syncHandler.clientTransportConnect(roomId);
+	}
+	clientTransportDisconnect(roomId) {
+		this.syncHandler.clientTransportDisconnect(roomId);
+	}
 };
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inditextech/weave-store-azure-web-pubsub",
-  "version": "3.3.1-SNAPSHOT.74.1",
+  "version": "3.3.1",
   "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": "3.3.1-SNAPSHOT.74.1",
-    "@inditextech/weave-sdk": "3.3.1-SNAPSHOT.74.1",
+    "@inditextech/weave-types": "3.3.1",
+    "@inditextech/weave-sdk": "3.3.1",
     "@syncedstore/core": "0.6.0",
     "buffer": "6.0.3",
     "reconnecting-websocket": "4.4.0",