@inditextech/weave-store-azure-web-pubsub 0.26.1 → 0.27.0

package/dist/client.cjs

@@ -1455,16 +1455,17 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 	* @param {number} [options.resyncInterval] Request server state every `resyncInterval` milliseconds.
 	* @param {number} [options.tokenProvider] token generator for negotiation.
 	*/
-	constructor(url, topic, doc, options = {
+	constructor(instance, url, topic, doc, options = {
 		resyncInterval: 15 * 1e3,
 		tokenProvider: null
 	}) {
 		super();
+		this.instance = instance;
 		this._options = options;
 		this.doc = doc;
 		this.topic = topic;
+		this._fetchClient = fetch;
 		this._url = url;
-		this._connectionUrl = null;
 		this._uuid = (0, uuid.v4)();
 		this._status = "disconnected";
 		this._wsConnected = false;
@@ -1534,12 +1535,15 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			this._ws.close();
 		}
 	}
-	async fetchConnectionUrl(fetchClient = fetch) {
+	setFetchClient(fetchClient = window.fetch) {
+		this._fetchClient = fetchClient.bind(window);
+	}
+	async fetchConnectionUrl() {
 		try {
-			const res = await fetchClient(this._url);
+			const res = await this._fetchClient(this._url);
 			if (res.ok) {
 				const data = await res.json();
-				this._connectionUrl = data.url;
+				return data.url;
 			} else throw new Error(`Failed to fetch connection url from: ${this._url}`);
 		} catch (err) {
 			throw new Error(`Failed to fetch connection url from: ${this._url}`);
@@ -1547,8 +1551,26 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 	}
 	async start() {
 		if (this._wsConnected || this._ws) return;
-		if (!this._connectionUrl) return;
-		const websocket = new reconnecting_websocket.default(this._connectionUrl, AzureWebPubSubJsonProtocol);
+		const websocket = new reconnecting_websocket.default(async () => {
+			let url = "https://error";
+			let error = null;
+			try {
+				this.instance.emitEvent("onStoreFetchConnectionUrl", {
+					loading: true,
+					error: null
+				});
+				url = await this.fetchConnectionUrl();
+			} catch (ex) {
+				error = ex;
+			} finally {
+				if (error) this.instance.handleConnectionStatusChange(WEAVE_STORE_CONNECTION_STATUS.ERROR);
+				this.instance.emitEvent("onStoreFetchConnectionUrl", {
+					loading: false,
+					error
+				});
+			}
+			return url;
+		}, AzureWebPubSubJsonProtocol);
 		websocket.binaryType = "arraybuffer";
 		this._ws = websocket;
 		this._wsConnected = false;
@@ -1647,7 +1669,7 @@ var WeaveStoreAzureWebPubsub = class extends __inditextech_weave_sdk.WeaveStore
 	}
 	init() {
 		const { url } = this.azureWebPubsubOptions;
-		this.provider = new WeaveStoreAzureWebPubSubSyncClient(url, this.roomId, this.getDocument(), {
+		this.provider = new WeaveStoreAzureWebPubSubSyncClient(this, url, this.roomId, this.getDocument(), {
 			resyncInterval: 1e3,
 			tokenProvider: null
 		});
@@ -1663,27 +1685,15 @@ var WeaveStoreAzureWebPubsub = class extends __inditextech_weave_sdk.WeaveStore
 			this.handleConnectionStatusChange(status);
 		});
 	}
+	emitEvent(name, payload) {
+		this.instance.emitEvent(name, payload);
+	}
 	async connect() {
 		const { fetchClient } = this.azureWebPubsubOptions;
 		const awareness = this.provider.awareness;
 		awareness.on("update", this.handleAwarenessChange.bind(this));
 		awareness.on("change", this.handleAwarenessChange.bind(this));
-		let error = null;
-		try {
-			this.instance.emitEvent("onStoreFetchConnectionUrl", {
-				loading: true,
-				error: null
-			});
-			await this.provider.fetchConnectionUrl(fetchClient ?? fetch);
-		} catch (ex) {
-			error = ex;
-		} finally {
-			if (error) this.handleConnectionStatusChange(WEAVE_STORE_CONNECTION_STATUS.ERROR);
-			this.instance.emitEvent("onStoreFetchConnectionUrl", {
-				loading: false,
-				error
-			});
-		}
+		this.provider.setFetchClient(fetchClient ?? window.fetch);
 		await this.provider.start();
 	}
 	disconnect() {

package/dist/client.d.cts

@@ -53,9 +53,10 @@ interface ClientOptions {
 declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   doc: Doc;
   topic: string;
+  private instance;
   private _ws;
   private _url;
-  private _connectionUrl;
+  private _fetchClient;
   private _status;
   private _wsConnected;
   private _synced;
@@ -74,7 +75,7 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   * @param {number} [options.resyncInterval] Request server state every `resyncInterval` milliseconds.
   * @param {number} [options.tokenProvider] token generator for negotiation.
   */
-  constructor(url: string, topic: string, doc: Doc, options?: ClientOptions);
+  constructor(instance: WeaveStoreAzureWebPubsub, url: string, topic: string, doc: Doc, options?: ClientOptions);
   get awareness(): awarenessProtocol.Awareness;
   get synced(): boolean;
   set synced(state: boolean);
@@ -83,7 +84,8 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   setupResyncInterval(): void;
   destroy(): void;
   stop(): void;
-  fetchConnectionUrl(fetchClient?: FetchClient): Promise<void>;
+  setFetchClient(fetchClient?: FetchClient): void;
+  fetchConnectionUrl(): Promise<string>;
   start(): Promise<void>;
 } //#endregion
 //#region src/store-azure-web-pubsub.d.ts
@@ -96,6 +98,7 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   protected awarenessCallback: (changes: any) => void;
   constructor(storeOptions: WeaveStoreOptions, azureWebPubsubOptions: WeaveStoreAzureWebPubsubOptions);
   private init;
+  emitEvent<T>(name: string, payload?: T): void;
   connect(): Promise<void>;
   disconnect(): void;
   handleAwarenessChange(emit?: boolean): void;

package/dist/client.d.ts

@@ -53,9 +53,10 @@ interface ClientOptions {
 declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   doc: Doc;
   topic: string;
+  private instance;
   private _ws;
   private _url;
-  private _connectionUrl;
+  private _fetchClient;
   private _status;
   private _wsConnected;
   private _synced;
@@ -74,7 +75,7 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   * @param {number} [options.resyncInterval] Request server state every `resyncInterval` milliseconds.
   * @param {number} [options.tokenProvider] token generator for negotiation.
   */
-  constructor(url: string, topic: string, doc: Doc, options?: ClientOptions);
+  constructor(instance: WeaveStoreAzureWebPubsub, url: string, topic: string, doc: Doc, options?: ClientOptions);
   get awareness(): awarenessProtocol.Awareness;
   get synced(): boolean;
   set synced(state: boolean);
@@ -83,7 +84,8 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   setupResyncInterval(): void;
   destroy(): void;
   stop(): void;
-  fetchConnectionUrl(fetchClient?: FetchClient): Promise<void>;
+  setFetchClient(fetchClient?: FetchClient): void;
+  fetchConnectionUrl(): Promise<string>;
   start(): Promise<void>;
 } //#endregion
 //#region src/store-azure-web-pubsub.d.ts
@@ -96,6 +98,7 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   protected awarenessCallback: (changes: any) => void;
   constructor(storeOptions: WeaveStoreOptions, azureWebPubsubOptions: WeaveStoreAzureWebPubsubOptions);
   private init;
+  emitEvent<T>(name: string, payload?: T): void;
   connect(): Promise<void>;
   disconnect(): void;
   handleAwarenessChange(emit?: boolean): void;

package/dist/client.js

@@ -1432,16 +1432,17 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 	* @param {number} [options.resyncInterval] Request server state every `resyncInterval` milliseconds.
 	* @param {number} [options.tokenProvider] token generator for negotiation.
 	*/
-	constructor(url, topic, doc, options = {
+	constructor(instance, url, topic, doc, options = {
 		resyncInterval: 15 * 1e3,
 		tokenProvider: null
 	}) {
 		super();
+		this.instance = instance;
 		this._options = options;
 		this.doc = doc;
 		this.topic = topic;
+		this._fetchClient = fetch;
 		this._url = url;
-		this._connectionUrl = null;
 		this._uuid = v4();
 		this._status = "disconnected";
 		this._wsConnected = false;
@@ -1511,12 +1512,15 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			this._ws.close();
 		}
 	}
-	async fetchConnectionUrl(fetchClient = fetch) {
+	setFetchClient(fetchClient = window.fetch) {
+		this._fetchClient = fetchClient.bind(window);
+	}
+	async fetchConnectionUrl() {
 		try {
-			const res = await fetchClient(this._url);
+			const res = await this._fetchClient(this._url);
 			if (res.ok) {
 				const data = await res.json();
-				this._connectionUrl = data.url;
+				return data.url;
 			} else throw new Error(`Failed to fetch connection url from: ${this._url}`);
 		} catch (err) {
 			throw new Error(`Failed to fetch connection url from: ${this._url}`);
@@ -1524,8 +1528,26 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 	}
 	async start() {
 		if (this._wsConnected || this._ws) return;
-		if (!this._connectionUrl) return;
-		const websocket = new ReconnectingWebSocket(this._connectionUrl, AzureWebPubSubJsonProtocol);
+		const websocket = new ReconnectingWebSocket(async () => {
+			let url = "https://error";
+			let error = null;
+			try {
+				this.instance.emitEvent("onStoreFetchConnectionUrl", {
+					loading: true,
+					error: null
+				});
+				url = await this.fetchConnectionUrl();
+			} catch (ex) {
+				error = ex;
+			} finally {
+				if (error) this.instance.handleConnectionStatusChange(WEAVE_STORE_CONNECTION_STATUS.ERROR);
+				this.instance.emitEvent("onStoreFetchConnectionUrl", {
+					loading: false,
+					error
+				});
+			}
+			return url;
+		}, AzureWebPubSubJsonProtocol);
 		websocket.binaryType = "arraybuffer";
 		this._ws = websocket;
 		this._wsConnected = false;
@@ -1624,7 +1646,7 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 	}
 	init() {
 		const { url } = this.azureWebPubsubOptions;
-		this.provider = new WeaveStoreAzureWebPubSubSyncClient(url, this.roomId, this.getDocument(), {
+		this.provider = new WeaveStoreAzureWebPubSubSyncClient(this, url, this.roomId, this.getDocument(), {
 			resyncInterval: 1e3,
 			tokenProvider: null
 		});
@@ -1640,27 +1662,15 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 			this.handleConnectionStatusChange(status);
 		});
 	}
+	emitEvent(name, payload) {
+		this.instance.emitEvent(name, payload);
+	}
 	async connect() {
 		const { fetchClient } = this.azureWebPubsubOptions;
 		const awareness = this.provider.awareness;
 		awareness.on("update", this.handleAwarenessChange.bind(this));
 		awareness.on("change", this.handleAwarenessChange.bind(this));
-		let error = null;
-		try {
-			this.instance.emitEvent("onStoreFetchConnectionUrl", {
-				loading: true,
-				error: null
-			});
-			await this.provider.fetchConnectionUrl(fetchClient ?? fetch);
-		} catch (ex) {
-			error = ex;
-		} finally {
-			if (error) this.handleConnectionStatusChange(WEAVE_STORE_CONNECTION_STATUS.ERROR);
-			this.instance.emitEvent("onStoreFetchConnectionUrl", {
-				loading: false,
-				error
-			});
-		}
+		this.provider.setFetchClient(fetchClient ?? window.fetch);
 		await this.provider.start();
 	}
 	disconnect() {

package/package.json

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