@inditextech/weave-store-azure-web-pubsub 3.4.0 → 3.6.0-SNAPSHOT.112.1

package/dist/client.d.ts

@@ -134,6 +134,7 @@ type FetchClient = (input: string | URL | globalThis.Request, init?: RequestInit
 type FetchInitialState = (doc: Doc) => void;
 type PersistRoom = (roomId: string, actualState: Uint8Array<ArrayBufferLike>) => Promise<void>;
 type FetchRoom = (roomId: string) => Promise<Uint8Array | null>;
+type WeaveRoomData = Uint8Array | FetchInitialState;
 type WeaveStoreAzureWebPubsubEvents = {
   onConnect: WeaveStoreAzureWebPubsubOnConnectEvent;
   onConnected: WeaveStoreAzureWebPubsubOnConnectedEvent;
@@ -229,6 +230,7 @@ type WeaveStoreAzureWebPubsubSyncHostOptions = {
     attemptsLimit: number;
   };
 };
+
 //#endregion
 //#region src/client.d.ts
 declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
@@ -285,16 +287,18 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   private roomId;
   private started;
   private initialRoomData;
+  private actualStatus;
   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">>);
+  constructor(initialRoomData: WeaveRoomData | 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;
+  switchToRoom(roomId: string, roomData: Uint8Array | FetchInitialState | undefined): Promise<void>;
   connect(extraParams?: Record<string, string>): Promise<void>;
   disconnect(): void;
   simulateWebsocketError(): void;
@@ -304,4 +308,4 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
 }
 
 //#endregion
-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_DESTROY_ROOM_STATUS, WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_CLIENT_DEFAULT_OPTIONS, WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_HOST_DEFAULT_OPTIONS, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubSyncHandlerOptions, WeaveStoreAzureWebPubSubSyncClientConnectionStatus, WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys, WeaveStoreAzureWebPubSubSyncClientOptions, WeaveStoreAzureWebPubSubSyncHostClientConnectOptions, WeaveStoreAzureWebPubsub, WeaveStoreAzureWebPubsubConfig, WeaveStoreAzureWebPubsubEvents, WeaveStoreAzureWebPubsubOnConnectEvent, WeaveStoreAzureWebPubsubOnConnectedEvent, WeaveStoreAzureWebPubsubOnDisconnectedEvent, WeaveStoreAzureWebPubsubOnStoreFetchConnectionUrlEvent, WeaveStoreAzureWebPubsubOnWebsocketCloseEvent, WeaveStoreAzureWebPubsubOnWebsocketErrorEvent, WeaveStoreAzureWebPubsubOnWebsocketJoinGroupEvent, WeaveStoreAzureWebPubsubOnWebsocketMessageEvent, WeaveStoreAzureWebPubsubOnWebsocketOpenEvent, WeaveStoreAzureWebPubsubOnWebsocketReconnectEvent, WeaveStoreAzureWebPubsubOptions, WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatus, WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatusKeys, WeaveStoreAzureWebPubsubSyncHostOptions };
+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_DESTROY_ROOM_STATUS, WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_CLIENT_DEFAULT_OPTIONS, WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_HOST_DEFAULT_OPTIONS, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubSyncHandlerOptions, WeaveRoomData, WeaveStoreAzureWebPubSubSyncClientConnectionStatus, WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys, WeaveStoreAzureWebPubSubSyncClientOptions, WeaveStoreAzureWebPubSubSyncHostClientConnectOptions, WeaveStoreAzureWebPubsub, WeaveStoreAzureWebPubsubConfig, WeaveStoreAzureWebPubsubEvents, WeaveStoreAzureWebPubsubOnConnectEvent, WeaveStoreAzureWebPubsubOnConnectedEvent, WeaveStoreAzureWebPubsubOnDisconnectedEvent, WeaveStoreAzureWebPubsubOnStoreFetchConnectionUrlEvent, WeaveStoreAzureWebPubsubOnWebsocketCloseEvent, WeaveStoreAzureWebPubsubOnWebsocketErrorEvent, WeaveStoreAzureWebPubsubOnWebsocketJoinGroupEvent, WeaveStoreAzureWebPubsubOnWebsocketMessageEvent, WeaveStoreAzureWebPubsubOnWebsocketOpenEvent, WeaveStoreAzureWebPubsubOnWebsocketReconnectEvent, WeaveStoreAzureWebPubsubOptions, WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatus, WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatusKeys, WeaveStoreAzureWebPubsubSyncHostOptions };

package/dist/client.js

@@ -3974,7 +3974,6 @@ 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;
 			}
@@ -4045,7 +4044,6 @@ 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();
 			}
@@ -4147,6 +4145,7 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 		this.roomId = roomId;
 		this.initialRoomData = initialRoomData;
 		this.started = false;
+		this.actualStatus = WEAVE_STORE_CONNECTION_STATUS.DISCONNECTED;
 		this.init();
 	}
 	setup() {
@@ -4160,7 +4159,8 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 	}
 	init() {
 		const { url } = this.azureWebPubsubOptions;
-		this.provider = new WeaveStoreAzureWebPubSubSyncClient(this, url, this.roomId, this.getDocument(), this.azureWebPubsubOptions.syncClientOptions);
+		const patchedUrl = url.replace("[roomId]", this.roomId);
+		this.provider = new WeaveStoreAzureWebPubSubSyncClient(this, patchedUrl, this.roomId, this.getDocument(), this.azureWebPubsubOptions.syncClientOptions);
 		const awareness = this.provider.awareness;
 		awareness.on("update", this.handleAwarenessChange.bind(this));
 		awareness.on("change", this.handleAwarenessChange.bind(this));
@@ -4172,7 +4172,11 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 			this.handleConnectionStatusChange(WEAVE_STORE_CONNECTION_STATUS.DISCONNECTED);
 		});
 		this.provider.on("status", (status) => {
-			this.handleConnectionStatusChange(status);
+			if (this.actualStatus !== WEAVE_STORE_CONNECTION_STATUS.SWITCHING_ROOM || this.actualStatus === WEAVE_STORE_CONNECTION_STATUS.SWITCHING_ROOM && status === WEAVE_STORE_CONNECTION_STATUS.CONNECTED) {
+				this.handleConnectionStatusChange(status);
+				if (this.actualStatus === WEAVE_STORE_CONNECTION_STATUS.SWITCHING_ROOM && status === WEAVE_STORE_CONNECTION_STATUS.CONNECTED) this.instance.emitEvent("onRoomSwitchingEnd", { room: this.roomId });
+				this.actualStatus = status;
+			}
 			if (status === WEAVE_STORE_CONNECTION_STATUS.CONNECTED && !this.started) {
 				this.loadRoomInitialData();
 				this.started = true;
@@ -4186,9 +4190,23 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 		if (this.provider) return this.provider.getClientId();
 		return null;
 	}
+	async switchToRoom(roomId, roomData) {
+		this.instance.emitEvent("onRoomSwitchingStart", { room: roomId });
+		this.actualStatus = WEAVE_STORE_CONNECTION_STATUS.SWITCHING_ROOM;
+		this.disconnect();
+		this.restartDocument();
+		await this.instance.switchRoom();
+		this.roomId = roomId;
+		this.initialRoomData = roomData;
+		this.started = false;
+		this.init();
+		this.setup();
+		this.connect();
+	}
 	async connect(extraParams) {
 		const { fetchClient } = this.azureWebPubsubOptions;
 		this.provider.setFetchClient(fetchClient ?? window.fetch);
+		this.instance.emitEvent("onStoreRoomChanged", { room: this.roomId });
 		await this.provider.connect(extraParams);
 	}
 	disconnect() {

package/dist/server.d.ts

@@ -42,16 +42,18 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   private roomId;
   private started;
   private initialRoomData;
+  private actualStatus;
   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">>);
+  constructor(initialRoomData: WeaveRoomData | 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;
+  switchToRoom(roomId: string, roomData: Uint8Array | FetchInitialState | undefined): Promise<void>;
   connect(extraParams?: Record<string, string>): Promise<void>;
   disconnect(): void;
   simulateWebsocketError(): void;
@@ -143,6 +145,7 @@ type FetchClient = (input: string | URL | globalThis.Request, init?: RequestInit
 type FetchInitialState = (doc: Doc) => void;
 type PersistRoom = (roomId: string, actualState: Uint8Array<ArrayBufferLike>) => Promise<void>;
 type FetchRoom = (roomId: string) => Promise<Uint8Array | null>;
+type WeaveRoomData = Uint8Array | FetchInitialState;
 type WeaveStoreAzureWebPubsubEvents = {
   onConnect: WeaveStoreAzureWebPubsubOnConnectEvent;
   onConnected: WeaveStoreAzureWebPubsubOnConnectedEvent;
@@ -419,7 +422,8 @@ declare enum MqttDisconnectReasonCode {
   * Description: The Server does not support Wildcard Subscriptions; the subscription is not accepted.
   */
   WildcardSubscriptionsNotSupported = 162,
-} //#endregion
+}
+//#endregion
 //#region src/server/event-handler/enum/mqtt-error-codes/mqtt-v311-connect-return-code.d.ts
 /**
 * MQTT 3.1.1 Connect Return Codes.
@@ -1134,4 +1138,4 @@ declare class WeaveAzureWebPubsubServer extends Emittery {
 }
 
 //#endregion
-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_DESTROY_ROOM_STATUS, WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_CLIENT_DEFAULT_OPTIONS, WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_HOST_DEFAULT_OPTIONS, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubServer, WeaveAzureWebPubsubSyncHandlerOptions, WeaveStoreAzureWebPubSubSyncClientConnectionStatus, WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys, WeaveStoreAzureWebPubSubSyncClientOptions, WeaveStoreAzureWebPubSubSyncHost, WeaveStoreAzureWebPubSubSyncHostClientConnectOptions, WeaveStoreAzureWebPubsubConfig, WeaveStoreAzureWebPubsubEvents, WeaveStoreAzureWebPubsubOnConnectEvent, WeaveStoreAzureWebPubsubOnConnectedEvent, WeaveStoreAzureWebPubsubOnDisconnectedEvent, WeaveStoreAzureWebPubsubOnStoreFetchConnectionUrlEvent, WeaveStoreAzureWebPubsubOnWebsocketCloseEvent, WeaveStoreAzureWebPubsubOnWebsocketErrorEvent, WeaveStoreAzureWebPubsubOnWebsocketJoinGroupEvent, WeaveStoreAzureWebPubsubOnWebsocketMessageEvent, WeaveStoreAzureWebPubsubOnWebsocketOpenEvent, WeaveStoreAzureWebPubsubOnWebsocketReconnectEvent, WeaveStoreAzureWebPubsubOptions, WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatus, WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatusKeys, WeaveStoreAzureWebPubsubSyncHostOptions, 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_DESTROY_ROOM_STATUS, WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_CLIENT_DEFAULT_OPTIONS, WEAVE_STORE_AZURE_WEB_PUBSUB_SYNC_HOST_DEFAULT_OPTIONS, WEAVE_STORE_HORIZONTAL_SYNC_HANDLER_CLIENT_TYPE, WeaveAzureWebPubsubServer, WeaveAzureWebPubsubSyncHandlerOptions, WeaveRoomData, WeaveStoreAzureWebPubSubSyncClientConnectionStatus, WeaveStoreAzureWebPubSubSyncClientConnectionStatusKeys, WeaveStoreAzureWebPubSubSyncClientOptions, WeaveStoreAzureWebPubSubSyncHost, WeaveStoreAzureWebPubSubSyncHostClientConnectOptions, WeaveStoreAzureWebPubsubConfig, WeaveStoreAzureWebPubsubEvents, WeaveStoreAzureWebPubsubOnConnectEvent, WeaveStoreAzureWebPubsubOnConnectedEvent, WeaveStoreAzureWebPubsubOnDisconnectedEvent, WeaveStoreAzureWebPubsubOnStoreFetchConnectionUrlEvent, WeaveStoreAzureWebPubsubOnWebsocketCloseEvent, WeaveStoreAzureWebPubsubOnWebsocketErrorEvent, WeaveStoreAzureWebPubsubOnWebsocketJoinGroupEvent, WeaveStoreAzureWebPubsubOnWebsocketMessageEvent, WeaveStoreAzureWebPubsubOnWebsocketOpenEvent, WeaveStoreAzureWebPubsubOnWebsocketReconnectEvent, WeaveStoreAzureWebPubsubOptions, WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatus, WeaveStoreAzureWebPubsubSyncHandlerDestroyRoomStatusKeys, WeaveStoreAzureWebPubsubSyncHostOptions, WebPubSubClientProtocol, WebPubSubEventHandler, WebPubSubEventHandlerOptions };

package/package.json

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