@inditextech/weave-store-azure-web-pubsub 0.62.3 → 0.62.4

package/dist/client.cjs

@@ -1535,7 +1535,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			const u8 = toUint8Array(encoder);
 			sendToControlGroup(this, this.topic, MessageDataType.Awareness, u8);
 			this._initialized = false;
-			this._ws.close();
+			if (this._ws.readyState === WebSocket.OPEN) this._ws.close();
 		}
 	}
 	setFetchClient(fetchClient = window.fetch) {
@@ -1552,8 +1552,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			throw new Error(`Failed to fetch connection url from: ${this._url}`);
 		}
 	}
-	async start() {
-		if (this._wsConnected || this._ws) return;
+	async createWebSocket() {
 		const websocket = new reconnecting_websocket.default(async () => {
 			let url = "https://error";
 			let error = null;
@@ -1598,7 +1597,7 @@ 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 = () => {
+		websocket.onclose = (ev) => {
 			this._status = "disconnected";
 			this.emit("status", this._status);
 			if (this._wsConnected) {
@@ -1608,6 +1607,10 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				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";
@@ -1630,6 +1633,11 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				sendToControlGroup(this, this.topic, MessageDataType.Awareness, u8$1);
 			}
 		};
+		return websocket;
+	}
+	async start() {
+		if (this._wsConnected || this._ws) return;
+		await this.createWebSocket();
 	}
 };
 function joinGroup(client, group) {

package/dist/client.d.cts

@@ -92,6 +92,7 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   stop(): void;
   setFetchClient(fetchClient?: FetchClient): void;
   fetchConnectionUrl(): Promise<string>;
+  createWebSocket(): Promise<ReconnectingWebSocket>;
   start(): Promise<void>;
 } //#endregion
 //#region src/store-azure-web-pubsub.d.ts

package/dist/client.d.ts

@@ -92,6 +92,7 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   stop(): void;
   setFetchClient(fetchClient?: FetchClient): void;
   fetchConnectionUrl(): Promise<string>;
+  createWebSocket(): Promise<ReconnectingWebSocket>;
   start(): Promise<void>;
 } //#endregion
 //#region src/store-azure-web-pubsub.d.ts

package/dist/client.js

@@ -1512,7 +1512,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			const u8 = toUint8Array(encoder);
 			sendToControlGroup(this, this.topic, MessageDataType.Awareness, u8);
 			this._initialized = false;
-			this._ws.close();
+			if (this._ws.readyState === WebSocket.OPEN) this._ws.close();
 		}
 	}
 	setFetchClient(fetchClient = window.fetch) {
@@ -1529,8 +1529,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			throw new Error(`Failed to fetch connection url from: ${this._url}`);
 		}
 	}
-	async start() {
-		if (this._wsConnected || this._ws) return;
+	async createWebSocket() {
 		const websocket = new ReconnectingWebSocket(async () => {
 			let url = "https://error";
 			let error = null;
@@ -1575,7 +1574,7 @@ 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 = () => {
+		websocket.onclose = (ev) => {
 			this._status = "disconnected";
 			this.emit("status", this._status);
 			if (this._wsConnected) {
@@ -1585,6 +1584,10 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				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";
@@ -1607,6 +1610,11 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				sendToControlGroup(this, this.topic, MessageDataType.Awareness, u8$1);
 			}
 		};
+		return websocket;
+	}
+	async start() {
+		if (this._wsConnected || this._ws) return;
+		await this.createWebSocket();
 	}
 };
 function joinGroup(client, group) {

package/dist/server.cjs

@@ -30650,6 +30650,7 @@ const applyAwarenessUpdate = (awareness, update, origin) => {
 
 //#endregion
 //#region src/server/azure-web-pubsub-host.ts
+const expirationTimeInMinutes = 60;
 const messageSync = 0;
 const messageAwareness = 1;
 const AzureWebPubSubJsonProtocol = "json.webpubsub.azure.v1";
@@ -30705,11 +30706,24 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 		const u8 = toUint8Array(encoderAwarenessState);
 		this.broadcast(this.topic, origin, u8);
 	}
-	async start() {
-		const url$1 = await this.negotiate(this.topic);
-		const conn = new reconnecting_websocket.default(url$1, AzureWebPubSubJsonProtocol, { WebSocket: this._polyfill });
+	async createWebSocket() {
 		const group = this.topic;
-		conn.onmessage = (e) => {
+		const { url: url$1 } = await this.negotiate(this.topic);
+		const ws$1 = new reconnecting_websocket.default(url$1, AzureWebPubSubJsonProtocol, {
+			WebSocket: this._polyfill,
+			connectionTimeout: 4e3,
+			maxRetries: Infinity,
+			maxReconnectionDelay: 8e3,
+			minReconnectionDelay: 1e3
+		});
+		ws$1.addEventListener("open", () => {
+			this.emit("connected");
+			ws$1.send(JSON.stringify({
+				type: MessageType.JoinGroup,
+				group: `${group}.host`
+			}));
+		});
+		ws$1.addEventListener("message", (e) => {
 			const event = JSON.parse(e.data.toString());
 			if (event.type === "message" && event.from === "group") switch (event.data.t) {
 				case MessageDataType.Init:
@@ -30724,21 +30738,27 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 					this.onAwareness(group, event.data);
 					return;
 			}
-		};
-		conn.addEventListener("error", (error) => {
+		});
+		ws$1.addEventListener("close", (ev) => {
+			if (ev.code === 1008 && ws$1.readyState === ws.WebSocket.OPEN) {
+				ws$1.close();
+				this._conn = this.createWebSocket();
+			}
+		});
+		ws$1.addEventListener("error", (error) => {
 			this.emit("error", error);
 		});
-		conn.onclose = () => {
-			this.emit("close");
-		};
-		conn.onopen = () => {
-			this.emit("connected");
-			conn.send(JSON.stringify({
-				type: MessageType.JoinGroup,
-				group: `${group}.host`
-			}));
-		};
-		this._conn = conn;
+		setTimeout(() => {
+			if (ws$1.readyState === ws.WebSocket.OPEN) {
+				ws$1.close();
+				this._conn = this.createWebSocket();
+			}
+		}, expirationTimeInMinutes * .75 * 60 * 1e3);
+		this._conn = ws$1;
+		return ws$1;
+	}
+	async start() {
+		this._conn = await this.createWebSocket();
 	}
 	broadcast(group, from$1, u8) {
 		this._conn?.send(JSON.stringify({
@@ -30804,10 +30824,11 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 			`webpubsub.joinLeaveGroup.${group}.host`
 		];
 		const res = await this._client.getClientAccessToken({
+			expirationTimeInMinutes,
 			userId: HostUserId,
 			roles
 		});
-		return res.url;
+		return res;
 	}
 };
 

package/dist/server.d.cts

@@ -5,6 +5,7 @@ import * as Y$1 from "yjs";
 import * as Y from "yjs";
 import { RequestHandler } from "express-serve-static-core";
 import * as awarenessProtocol from "y-protocols/awareness";
+import ReconnectingWebSocket from "reconnecting-websocket";
 import { WebPubSubServiceClient } from "@azure/web-pubsub";
 
 //#region src/types.d.ts
@@ -573,6 +574,7 @@ declare class WeaveStoreAzureWebPubSubSyncHost extends Emittery {
   }: WebPubSubHostOptions);
   get awareness(): awarenessProtocol.Awareness;
   sendInitAwarenessInfo(origin: string): void;
+  createWebSocket(): Promise<ReconnectingWebSocket>;
   start(): Promise<void>;
   private broadcast;
   private send;

package/dist/server.d.ts

@@ -2,6 +2,7 @@ import { WebPubSubServiceClient } from "@azure/web-pubsub";
 import { TokenCredential } from "@azure/identity";
 import * as Y$1 from "yjs";
 import * as Y from "yjs";
+import ReconnectingWebSocket from "reconnecting-websocket";
 import koa from "koa";
 import Emittery from "emittery";
 import { RequestHandler } from "express-serve-static-core";
@@ -573,6 +574,7 @@ declare class WeaveStoreAzureWebPubSubSyncHost extends Emittery {
   }: WebPubSubHostOptions);
   get awareness(): awarenessProtocol.Awareness;
   sendInitAwarenessInfo(origin: string): void;
+  createWebSocket(): Promise<ReconnectingWebSocket>;
   start(): Promise<void>;
   private broadcast;
   private send;

package/dist/server.js

@@ -30654,6 +30654,7 @@ const applyAwarenessUpdate = (awareness, update, origin) => {
 
 //#endregion
 //#region src/server/azure-web-pubsub-host.ts
+const expirationTimeInMinutes = 60;
 const messageSync = 0;
 const messageAwareness = 1;
 const AzureWebPubSubJsonProtocol = "json.webpubsub.azure.v1";
@@ -30709,11 +30710,24 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 		const u8 = toUint8Array(encoderAwarenessState);
 		this.broadcast(this.topic, origin, u8);
 	}
-	async start() {
-		const url$1 = await this.negotiate(this.topic);
-		const conn = new ReconnectingWebSocket(url$1, AzureWebPubSubJsonProtocol, { WebSocket: this._polyfill });
+	async createWebSocket() {
 		const group = this.topic;
-		conn.onmessage = (e) => {
+		const { url: url$1 } = await this.negotiate(this.topic);
+		const ws = new ReconnectingWebSocket(url$1, AzureWebPubSubJsonProtocol, {
+			WebSocket: this._polyfill,
+			connectionTimeout: 4e3,
+			maxRetries: Infinity,
+			maxReconnectionDelay: 8e3,
+			minReconnectionDelay: 1e3
+		});
+		ws.addEventListener("open", () => {
+			this.emit("connected");
+			ws.send(JSON.stringify({
+				type: MessageType.JoinGroup,
+				group: `${group}.host`
+			}));
+		});
+		ws.addEventListener("message", (e) => {
 			const event = JSON.parse(e.data.toString());
 			if (event.type === "message" && event.from === "group") switch (event.data.t) {
 				case MessageDataType.Init:
@@ -30728,21 +30742,27 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 					this.onAwareness(group, event.data);
 					return;
 			}
-		};
-		conn.addEventListener("error", (error) => {
+		});
+		ws.addEventListener("close", (ev) => {
+			if (ev.code === 1008 && ws.readyState === WebSocket.OPEN) {
+				ws.close();
+				this._conn = this.createWebSocket();
+			}
+		});
+		ws.addEventListener("error", (error) => {
 			this.emit("error", error);
 		});
-		conn.onclose = () => {
-			this.emit("close");
-		};
-		conn.onopen = () => {
-			this.emit("connected");
-			conn.send(JSON.stringify({
-				type: MessageType.JoinGroup,
-				group: `${group}.host`
-			}));
-		};
-		this._conn = conn;
+		setTimeout(() => {
+			if (ws.readyState === WebSocket.OPEN) {
+				ws.close();
+				this._conn = this.createWebSocket();
+			}
+		}, expirationTimeInMinutes * .75 * 60 * 1e3);
+		this._conn = ws;
+		return ws;
+	}
+	async start() {
+		this._conn = await this.createWebSocket();
 	}
 	broadcast(group, from$1, u8) {
 		this._conn?.send(JSON.stringify({
@@ -30808,10 +30828,11 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 			`webpubsub.joinLeaveGroup.${group}.host`
 		];
 		const res = await this._client.getClientAccessToken({
+			expirationTimeInMinutes,
 			userId: HostUserId,
 			roles
 		});
-		return res.url;
+		return res;
 	}
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inditextech/weave-store-azure-web-pubsub",
-  "version": "0.62.3",
+  "version": "0.62.4",
   "type": "module",
   "license": "Apache-2.0",
   "author": "Jesus Manuel Piñeiro Cid <jesusmpc@inditex.com>",
@@ -61,7 +61,7 @@
     "yjs": "13.6.27"
   },
   "devDependencies": {
-    "@inditextech/weave-sdk": "0.62.3",
+    "@inditextech/weave-sdk": "0.62.4",
     "@koa/cors": "^5.0.0",
     "@types/express": "^5.0.1",
     "@types/ioredis": "^4.28.10",