@inditextech/weave-store-azure-web-pubsub 4.2.0-SNAPSHOT.307.1 → 4.2.0

package/dist/client.d.ts

@@ -216,6 +216,9 @@ type MessageHandler = (encoder: Encoder, decoder: Decoder, client: WeaveStoreAzu
 type WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatusKeys = keyof typeof WEAVE_STORE_AZURE_WEB_PUBSUB_DESTROY_ROOM_STATUS;
 type WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatus = (typeof WEAVE_STORE_AZURE_WEB_PUBSUB_DESTROY_ROOM_STATUS)[WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatusKeys];
 type WeaveStoreAzureWebPubSubSyncClientOptions = {
+  clientConnection: {
+    timeoutMs: number;
+  };
   heartbeat: {
     checkWindowTimeMs: number;
     checkIntervalMs: number;
@@ -270,7 +273,7 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   getClientId(): string;
   saveLastSyncResponse(): void;
   simulateWebsocketError(): void;
-  disconnect(): void;
+  disconnect(): Promise<void>;
   setFetchClient(fetchClient?: FetchClient): void;
   fetchConnectionUrl(connectionUrlExtraParams?: Record<string, string>): Promise<string>;
   createWebSocket(connectionUrlExtraParams?: Record<string, string>): Promise<ReconnectingWebSocket>;
@@ -300,7 +303,7 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   getClientId(): string | null;
   switchToRoom(roomId: string, roomData: Uint8Array | FetchInitialState | undefined): Promise<void>;
   connect(extraParams?: Record<string, string>): Promise<void>;
-  disconnect(): void;
+  disconnect(): Promise<void>;
   simulateWebsocketError(): void;
   destroy(): void;
   handleAwarenessChange(emit?: boolean): void;

package/dist/client.js

@@ -3738,14 +3738,17 @@ const WEAVE_STORE_AZURE_WEB_PUBSUB_DESTROY_ROOM_STATUS = {
 	["NOT_CONNECTED"]: "not-connected",
 	["DESTROYED"]: "destroyed"
 };
-const WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_CLIENT_DEFAULT_OPTIONS = { heartbeat: {
-	checkWindowTimeMs: 1e4,
-	checkIntervalMs: 5e3
-} };
+const WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_CLIENT_DEFAULT_OPTIONS = {
+	clientConnection: { timeoutMs: 6e4 },
+	heartbeat: {
+		checkWindowTimeMs: 6e4,
+		checkIntervalMs: 15e3
+	}
+};
 const WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_HOST_DEFAULT_OPTIONS = {
-	heartbeat: { sendIntervalMs: 2500 },
+	heartbeat: { sendIntervalMs: 5e3 },
 	resync: {
-		checkIntervalMs: 5e3,
+		checkIntervalMs: 6e4,
 		attemptsLimit: 12
 	}
 };
@@ -3891,7 +3894,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 	simulateWebsocketError() {
 		if (this._ws) this._ws._ws.close(4e3, new Error("Simulated error for testing"));
 	}
-	disconnect() {
+	async disconnect() {
 		if (this._ws !== null) {
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageAwareness);
@@ -3919,7 +3922,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				}
 			}
 			const controller = new AbortController();
-			const timeout = setTimeout(() => controller.abort(), 5e3);
+			const timeout = setTimeout(() => controller.abort(), this._synClientOptions.clientConnection.timeoutMs);
 			const res = await this._fetchClient(connectionURL.toString(), { signal: controller.signal }).finally(() => clearTimeout(timeout));
 			if (res.ok) {
 				const data = await res.json();
@@ -3940,6 +3943,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				});
 				url = await this.fetchConnectionUrl(connectionUrlExtraParams);
 			} catch (ex) {
+				console.error(ex);
 				error = ex;
 			} finally {
 				if (error) this.instance.handleConnectionStatusChange(WEAVE_STORE_CONNECTION_STATUS.ERROR);
@@ -3965,19 +3969,21 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			}
 			this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.ERROR);
 		});
-		websocket.onmessage = (event) => {
+		websocket.onmessage = async (event) => {
 			if (event.data === null) return;
 			const message = JSON.parse(event.data.toString());
 			if (message.type === MessageType.System) return;
 			const messageData = message.data;
 			if (messageData.type === "heartbeat") {
-				this._lastHeartbeatTime = Date.now();
+				const actualDate = Date.now();
+				this._lastHeartbeatTime = actualDate;
 				return;
 			}
 			if (messageData.type === "resync") {
 				const encoder$1 = createEncoder();
 				writeVarUint(encoder$1, messageSyncStep1);
-				writeUpdate(encoder$1, yjs_default.encodeStateAsUpdate(this.doc));
+				const stateVector = yjs_default.encodeStateVector(this.doc);
+				writeUpdate(encoder$1, yjs_default.encodeStateAsUpdate(this.doc, stateVector));
 				sendToControlGroup(this, this.topic, MessageDataType.Sync, toUint8Array(encoder$1));
 				return;
 			}
@@ -4000,14 +4006,13 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				removeAwarenessStates(this.awareness, Array.from(this.awareness.getStates().keys()).filter((x) => x !== this.doc.clientID), this);
 			}
 		};
-		websocket.onopen = () => {
+		websocket.onopen = async () => {
 			this._lastHeartbeatTime = Date.now();
 			this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.CONNECTED);
 			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`);
@@ -4030,6 +4035,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				const u82 = toUint8Array(encoder);
 				sendToControlGroup(this, this.topic, MessageDataType.Awareness, u82);
 			}
+			this.setupCheckHeartbeat();
 		};
 		this.setAndEmitStatusInfo(WEAVE_STORE_AZURE_WEB_PUBSUB_CONNECTION_STATUS.CONNECTING);
 		return websocket;
@@ -4039,10 +4045,11 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 		this.emit("status", this._status);
 	}
 	setupCheckHeartbeat() {
-		this._checkHeartbeatId = setInterval(() => {
+		this._checkHeartbeatId = setInterval(async () => {
 			const now = Date.now();
 			if (now - this._lastHeartbeatTime > this._synClientOptions.heartbeat.checkWindowTimeMs) {
-				this.disconnect();
+				if (this._checkHeartbeatId) clearInterval(this._checkHeartbeatId);
+				await this.disconnect();
 				this.createWebSocket();
 			}
 		}, this._synClientOptions.heartbeat.checkIntervalMs);
@@ -4057,7 +4064,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 	}
 };
 function safeSend(data) {
-	const MAX_BYTES = 64 * 1024;
+	const MAX_BYTES = 512 * 1024;
 	const bytes = new TextEncoder().encode(data);
 	if (bytes.byteLength > MAX_BYTES) return false;
 	return true;
@@ -4094,7 +4101,7 @@ function chunkString(str, size$1) {
 }
 function sendToControlGroupChunked(client, group, type, u8) {
 	const base64Data = uint8ToBase64(u8);
-	const CHUNK_SIZE = 60 * 1024;
+	const CHUNK_SIZE = 512 * 1024;
 	const chunks = chunkString(base64Data, CHUNK_SIZE);
 	const payloadId = v4();
 	for (let i = 0; i < chunks.length; i++) {
@@ -4191,7 +4198,7 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 	async switchToRoom(roomId, roomData) {
 		this.instance.emitEvent("onRoomSwitchingStart", { room: roomId });
 		this.actualStatus = WEAVE_STORE_CONNECTION_STATUS.SWITCHING_ROOM;
-		this.disconnect();
+		await this.disconnect();
 		this.restartDocument();
 		await this.instance.switchRoom();
 		this.roomId = roomId;
@@ -4207,8 +4214,8 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 		this.instance.emitEvent("onStoreRoomChanged", { room: this.roomId });
 		await this.provider.connect(extraParams);
 	}
-	disconnect() {
-		this.provider.disconnect();
+	async disconnect() {
+		await this.provider.disconnect();
 	}
 	simulateWebsocketError() {
 		this.provider.simulateWebsocketError();