@inditextech/weave-store-azure-web-pubsub 3.4.0-SNAPSHOT.85.1 → 3.5.0

package/dist/client.d.ts

@@ -134,7 +134,6 @@ 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;
@@ -230,7 +229,6 @@ type WeaveStoreAzureWebPubsubSyncHostOptions = {
     attemptsLimit: number;
   };
 };
-
 //#endregion
 //#region src/client.d.ts
 declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
@@ -287,18 +285,16 @@ 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: WeaveRoomData | undefined, storeOptions: WeaveStoreOptions, azureWebPubsubOptions: Pick<WeaveStoreAzureWebPubsubOptions, "roomId" | "url"> & Partial<Omit<WeaveStoreAzureWebPubsubOptions, "roomId" | "url">>);
+  constructor(initialRoomData: Uint8Array | FetchInitialState | 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;
@@ -308,4 +304,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, WeaveRoomData, 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, 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

@@ -2560,10 +2560,12 @@ var Emittery = class Emittery {
 			});
 		}
 	}
-	once(eventNames) {
+	once(eventNames, predicate) {
+		if (predicate !== void 0 && typeof predicate !== "function") throw new TypeError("predicate must be a function");
 		let off_;
 		const promise = new Promise((resolve) => {
 			off_ = this.on(eventNames, (data) => {
+				if (predicate && !predicate(data)) return;
 				off_();
 				resolve(data);
 			});
@@ -2596,10 +2598,11 @@ var Emittery = class Emittery {
 		assertEventName(eventName);
 		if (isMetaEvent(eventName) && !canEmitMetaEvents) throw new TypeError("`eventName` cannot be meta event `listenerAdded` or `listenerRemoved`");
 		this.logIfDebugEnabled("emitSerial", eventName, eventData);
+		enqueueProducers(this, eventName, eventData);
 		const listeners = getListeners(this, eventName) ?? new Set();
 		const anyListeners = anyMap.get(this);
 		const staticListeners = [...listeners];
-		const staticAnyListeners = [...anyListeners];
+		const staticAnyListeners = isMetaEvent(eventName) ? [] : [...anyListeners];
 		await resolvedPromise;
 		for (const listener of staticListeners) if (listeners.has(listener)) await listener(eventData);
 		for (const listener of staticAnyListeners) if (anyListeners.has(listener)) await listener(eventName, eventData);
@@ -3971,6 +3974,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;
 			}
@@ -4041,6 +4045,7 @@ 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();
 			}
@@ -4142,7 +4147,6 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 		this.roomId = roomId;
 		this.initialRoomData = initialRoomData;
 		this.started = false;
-		this.actualStatus = WEAVE_STORE_CONNECTION_STATUS.DISCONNECTED;
 		this.init();
 	}
 	setup() {
@@ -4156,8 +4160,7 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 	}
 	init() {
 		const { url } = this.azureWebPubsubOptions;
-		const patchedUrl = url.replace("[roomId]", this.roomId);
-		this.provider = new WeaveStoreAzureWebPubSubSyncClient(this, patchedUrl, this.roomId, this.getDocument(), this.azureWebPubsubOptions.syncClientOptions);
+		this.provider = new WeaveStoreAzureWebPubSubSyncClient(this, url, 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));
@@ -4169,11 +4172,7 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 			this.handleConnectionStatusChange(WEAVE_STORE_CONNECTION_STATUS.DISCONNECTED);
 		});
 		this.provider.on("status", (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;
-			}
+			this.handleConnectionStatusChange(status);
 			if (status === WEAVE_STORE_CONNECTION_STATUS.CONNECTED && !this.started) {
 				this.loadRoomInitialData();
 				this.started = true;
@@ -4187,23 +4186,9 @@ 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,18 +42,16 @@ 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: WeaveRoomData | undefined, storeOptions: WeaveStoreOptions, azureWebPubsubOptions: Pick<WeaveStoreAzureWebPubsubOptions, "roomId" | "url"> & Partial<Omit<WeaveStoreAzureWebPubsubOptions, "roomId" | "url">>);
+  constructor(initialRoomData: Uint8Array | FetchInitialState | 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;
@@ -145,7 +143,6 @@ 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;
@@ -422,8 +419,7 @@ 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.
@@ -1138,4 +1134,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, 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 };
+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 };