@inditextech/weave-store-azure-web-pubsub 0.40.2 → 0.42.0

package/dist/client.cjs

@@ -1426,9 +1426,9 @@ let MessageDataType = /* @__PURE__ */ function(MessageDataType$1) {
 	return MessageDataType$1;
 }({});
 const messageHandlers = [];
-messageHandlers[messageSyncStep1] = (encoder, decoder, client, emitSynced, messageType) => {
+messageHandlers[messageSyncStep1] = (encoder, decoder, client, clientId, emitSynced, messageType) => {
 	writeVarUint(encoder, messageType);
-	const syncMessageType = readSyncMessage(decoder, encoder, client.doc, client);
+	const syncMessageType = readSyncMessage(decoder, encoder, client.doc, clientId);
 	if (emitSynced && syncMessageType === messageYjsSyncStep2 && !client.synced) client.synced = true;
 };
 messageHandlers[messageQueryAwareness] = (encoder, _, client) => {
@@ -1438,12 +1438,12 @@ messageHandlers[messageQueryAwareness] = (encoder, _, client) => {
 messageHandlers[messageAwareness] = (_, decoder, client) => {
 	applyAwarenessUpdate(client.awareness, readVarUint8Array(decoder), client);
 };
-const readMessage = (client, buf, emitSynced) => {
+const readMessage = (client, buf, emitSynced, clientId) => {
 	const decoder = createDecoder(buf);
 	const encoder = createEncoder();
 	const messageType = readVarUint(decoder);
 	const messageHandler = messageHandlers[messageType];
-	if (messageHandler) messageHandler(encoder, decoder, client, emitSynced, messageType);
+	if (messageHandler) messageHandler(encoder, decoder, client, clientId, emitSynced, messageType);
 	else throw new Error(`unable to handle message with type: ${messageType}`);
 	return encoder;
 };
@@ -1481,6 +1481,10 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				const encoder = createEncoder();
 				writeVarUint(encoder, messageSyncStep1);
 				writeUpdate(encoder, update);
+				if (origin) {
+					const actualStateJSON = this.doc.getMap("weave").toJSON();
+					console.log(`State update from: ${origin}`, { actualStateJSON });
+				}
 				sendToControlGroup(this, topic, MessageDataType.Sync, toUint8Array(encoder));
 			}
 		};
@@ -1509,6 +1513,9 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 	get id() {
 		return this._uuid;
 	}
+	getClientId() {
+		return this.id;
+	}
 	setupResyncInterval() {
 		if (this._options.resyncInterval > 0) this._resyncInterval = setInterval(() => {
 			if (this._ws && this._wsConnected) {
@@ -1592,7 +1599,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			const messageData = message.data;
 			if (messageData.t !== void 0 && messageData.t !== this._uuid) return;
 			const buf = buffer.Buffer.from(messageData.c, "base64");
-			const encoder = readMessage(this, buf, true);
+			const encoder = readMessage(this, buf, true, messageData.f);
 			if (length$1(encoder) > 1) sendToControlGroup(this, this.topic, MessageDataType.Sync, toUint8Array(encoder));
 		};
 		websocket.onclose = () => {
@@ -1688,6 +1695,10 @@ var WeaveStoreAzureWebPubsub = class extends __inditextech_weave_sdk.WeaveStore
 	emitEvent(name, payload) {
 		this.instance.emitEvent(name, payload);
 	}
+	getClientId() {
+		if (this.provider) return this.provider.getClientId();
+		return null;
+	}
 	async connect() {
 		const { fetchClient } = this.azureWebPubsubOptions;
 		const awareness = this.provider.awareness;

package/dist/client.d.cts

@@ -86,6 +86,7 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   set synced(state: boolean);
   get ws(): ReconnectingWebSocket | null;
   get id(): string;
+  getClientId(): string;
   setupResyncInterval(): void;
   destroy(): void;
   stop(): void;
@@ -104,6 +105,7 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   constructor(storeOptions: WeaveStoreOptions, azureWebPubsubOptions: WeaveStoreAzureWebPubsubOptions);
   private init;
   emitEvent<T>(name: string, payload?: T): void;
+  getClientId(): string | null;
   connect(): Promise<void>;
   disconnect(): void;
   handleAwarenessChange(emit?: boolean): void;

package/dist/client.d.ts

@@ -86,6 +86,7 @@ declare class WeaveStoreAzureWebPubSubSyncClient extends Emittery {
   set synced(state: boolean);
   get ws(): ReconnectingWebSocket | null;
   get id(): string;
+  getClientId(): string;
   setupResyncInterval(): void;
   destroy(): void;
   stop(): void;
@@ -104,6 +105,7 @@ declare class WeaveStoreAzureWebPubsub extends WeaveStore {
   constructor(storeOptions: WeaveStoreOptions, azureWebPubsubOptions: WeaveStoreAzureWebPubsubOptions);
   private init;
   emitEvent<T>(name: string, payload?: T): void;
+  getClientId(): string | null;
   connect(): Promise<void>;
   disconnect(): void;
   handleAwarenessChange(emit?: boolean): void;

package/dist/client.js

@@ -1403,9 +1403,9 @@ let MessageDataType = /* @__PURE__ */ function(MessageDataType$1) {
 	return MessageDataType$1;
 }({});
 const messageHandlers = [];
-messageHandlers[messageSyncStep1] = (encoder, decoder, client, emitSynced, messageType) => {
+messageHandlers[messageSyncStep1] = (encoder, decoder, client, clientId, emitSynced, messageType) => {
 	writeVarUint(encoder, messageType);
-	const syncMessageType = readSyncMessage(decoder, encoder, client.doc, client);
+	const syncMessageType = readSyncMessage(decoder, encoder, client.doc, clientId);
 	if (emitSynced && syncMessageType === messageYjsSyncStep2 && !client.synced) client.synced = true;
 };
 messageHandlers[messageQueryAwareness] = (encoder, _, client) => {
@@ -1415,12 +1415,12 @@ messageHandlers[messageQueryAwareness] = (encoder, _, client) => {
 messageHandlers[messageAwareness] = (_, decoder, client) => {
 	applyAwarenessUpdate(client.awareness, readVarUint8Array(decoder), client);
 };
-const readMessage = (client, buf, emitSynced) => {
+const readMessage = (client, buf, emitSynced, clientId) => {
 	const decoder = createDecoder(buf);
 	const encoder = createEncoder();
 	const messageType = readVarUint(decoder);
 	const messageHandler = messageHandlers[messageType];
-	if (messageHandler) messageHandler(encoder, decoder, client, emitSynced, messageType);
+	if (messageHandler) messageHandler(encoder, decoder, client, clientId, emitSynced, messageType);
 	else throw new Error(`unable to handle message with type: ${messageType}`);
 	return encoder;
 };
@@ -1458,6 +1458,10 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 				const encoder = createEncoder();
 				writeVarUint(encoder, messageSyncStep1);
 				writeUpdate(encoder, update);
+				if (origin) {
+					const actualStateJSON = this.doc.getMap("weave").toJSON();
+					console.log(`State update from: ${origin}`, { actualStateJSON });
+				}
 				sendToControlGroup(this, topic, MessageDataType.Sync, toUint8Array(encoder));
 			}
 		};
@@ -1486,6 +1490,9 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 	get id() {
 		return this._uuid;
 	}
+	getClientId() {
+		return this.id;
+	}
 	setupResyncInterval() {
 		if (this._options.resyncInterval > 0) this._resyncInterval = setInterval(() => {
 			if (this._ws && this._wsConnected) {
@@ -1569,7 +1576,7 @@ var WeaveStoreAzureWebPubSubSyncClient = class extends Emittery {
 			const messageData = message.data;
 			if (messageData.t !== void 0 && messageData.t !== this._uuid) return;
 			const buf = Buffer.from(messageData.c, "base64");
-			const encoder = readMessage(this, buf, true);
+			const encoder = readMessage(this, buf, true, messageData.f);
 			if (length$1(encoder) > 1) sendToControlGroup(this, this.topic, MessageDataType.Sync, toUint8Array(encoder));
 		};
 		websocket.onclose = () => {
@@ -1665,6 +1672,10 @@ var WeaveStoreAzureWebPubsub = class extends WeaveStore {
 	emitEvent(name, payload) {
 		this.instance.emitEvent(name, payload);
 	}
+	getClientId() {
+		if (this.provider) return this.provider.getClientId();
+		return null;
+	}
 	async connect() {
 		const { fetchClient } = this.azureWebPubsubOptions;
 		const awareness = this.provider.awareness;

package/dist/server.cjs

@@ -30677,33 +30677,41 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 		this._polyfill = WebSocketPolyfill;
 		this._awareness = new Awareness(this.doc);
 		this._awareness.setLocalState(null);
-		const awarenessUpdateHandler = ({ added, updated, removed }) => {
+		const awarenessUpdateHandler = ({ added, updated, removed }, origin) => {
 			const changedClients = added.concat(added, updated, removed);
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageAwareness);
 			writeVarUint8Array(encoder, encodeAwarenessUpdate(this._awareness, changedClients));
 			const u8 = toUint8Array(encoder);
-			this.broadcast(this.topic, u8);
+			this.broadcast(this.topic, origin, u8);
 		};
 		this._awareness.on("update", awarenessUpdateHandler);
-		const updateHandler = (update) => {
+		const updateHandler = (update, origin) => {
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageSync);
 			writeUpdate(encoder, update);
 			const u8 = toUint8Array(encoder);
-			this.broadcast(this.topic, u8);
+			if (origin) {
+				const actualStateJSONString = JSON.stringify(doc.getMap("weave").toJSON(), null, 2);
+				console.log(`=======================================`);
+				console.log(`State update from ${origin}`);
+				console.log(`=======================================`);
+				console.log(actualStateJSONString);
+				console.log(`=======================================`);
+			}
+			this.broadcast(this.topic, origin, u8);
 		};
-		doc.on("update", updateHandler);
+		this.doc.on("update", updateHandler);
 	}
 	get awareness() {
 		return this._awareness;
 	}
-	sendInitAwarenessInfo() {
+	sendInitAwarenessInfo(origin) {
 		const encoderAwarenessState = createEncoder();
 		writeVarUint(encoderAwarenessState, messageAwareness);
 		writeVarUint8Array(encoderAwarenessState, encodeAwarenessUpdate(this._awareness, Array.from(this._awareness.getStates().keys())));
 		const u8 = toUint8Array(encoderAwarenessState);
-		this.broadcast(this.topic, u8);
+		this.broadcast(this.topic, origin, u8);
 	}
 	async start() {
 		const url$1 = await this.negotiate(this.topic);
@@ -30715,7 +30723,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 				case MessageDataType.Init:
 					this.onClientInit(group, event.data);
 					this.onClientSync(group, event.data);
-					this.sendInitAwarenessInfo();
+					this.sendInitAwarenessInfo(event.data.f);
 					return;
 				case MessageDataType.Sync:
 					this.onClientSync(group, event.data);
@@ -30740,12 +30748,15 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 		};
 		this._conn = conn;
 	}
-	broadcast(group, u8) {
+	broadcast(group, from$1, u8) {
 		this._conn?.send(JSON.stringify({
 			type: MessageType.SendToGroup,
 			group,
 			noEcho: true,
-			data: { c: Buffer.from(u8).toString("base64") }
+			data: {
+				f: from$1,
+				c: Buffer.from(u8).toString("base64")
+			}
 		}));
 	}
 	send(group, to, u8) {
@@ -30775,7 +30786,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 			switch (messageType) {
 				case messageYjsSyncStep1:
 					writeVarUint(encoder, messageYjsSyncStep1);
-					readSyncMessage(decoder, encoder, this.doc, null);
+					readSyncMessage(decoder, encoder, this.doc, data.f);
 					if (length$1(encoder) > 1) this.send(group, data.f, toUint8Array(encoder));
 					break;
 			}

package/dist/server.d.cts

@@ -572,7 +572,7 @@ declare class WeaveStoreAzureWebPubSubSyncHost extends Emittery {
     WebSocketPolyfill
   }: WebPubSubHostOptions);
   get awareness(): awarenessProtocol.Awareness;
-  sendInitAwarenessInfo(): void;
+  sendInitAwarenessInfo(origin: string): void;
   start(): Promise<void>;
   private broadcast;
   private send;

package/dist/server.d.ts

@@ -572,7 +572,7 @@ declare class WeaveStoreAzureWebPubSubSyncHost extends Emittery {
     WebSocketPolyfill
   }: WebPubSubHostOptions);
   get awareness(): awarenessProtocol.Awareness;
-  sendInitAwarenessInfo(): void;
+  sendInitAwarenessInfo(origin: string): void;
   start(): Promise<void>;
   private broadcast;
   private send;

package/dist/server.js

@@ -30681,33 +30681,41 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 		this._polyfill = WebSocketPolyfill;
 		this._awareness = new Awareness(this.doc);
 		this._awareness.setLocalState(null);
-		const awarenessUpdateHandler = ({ added, updated, removed }) => {
+		const awarenessUpdateHandler = ({ added, updated, removed }, origin) => {
 			const changedClients = added.concat(added, updated, removed);
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageAwareness);
 			writeVarUint8Array(encoder, encodeAwarenessUpdate(this._awareness, changedClients));
 			const u8 = toUint8Array(encoder);
-			this.broadcast(this.topic, u8);
+			this.broadcast(this.topic, origin, u8);
 		};
 		this._awareness.on("update", awarenessUpdateHandler);
-		const updateHandler = (update) => {
+		const updateHandler = (update, origin) => {
 			const encoder = createEncoder();
 			writeVarUint(encoder, messageSync);
 			writeUpdate(encoder, update);
 			const u8 = toUint8Array(encoder);
-			this.broadcast(this.topic, u8);
+			if (origin) {
+				const actualStateJSONString = JSON.stringify(doc.getMap("weave").toJSON(), null, 2);
+				console.log(`=======================================`);
+				console.log(`State update from ${origin}`);
+				console.log(`=======================================`);
+				console.log(actualStateJSONString);
+				console.log(`=======================================`);
+			}
+			this.broadcast(this.topic, origin, u8);
 		};
-		doc.on("update", updateHandler);
+		this.doc.on("update", updateHandler);
 	}
 	get awareness() {
 		return this._awareness;
 	}
-	sendInitAwarenessInfo() {
+	sendInitAwarenessInfo(origin) {
 		const encoderAwarenessState = createEncoder();
 		writeVarUint(encoderAwarenessState, messageAwareness);
 		writeVarUint8Array(encoderAwarenessState, encodeAwarenessUpdate(this._awareness, Array.from(this._awareness.getStates().keys())));
 		const u8 = toUint8Array(encoderAwarenessState);
-		this.broadcast(this.topic, u8);
+		this.broadcast(this.topic, origin, u8);
 	}
 	async start() {
 		const url$1 = await this.negotiate(this.topic);
@@ -30719,7 +30727,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 				case MessageDataType.Init:
 					this.onClientInit(group, event.data);
 					this.onClientSync(group, event.data);
-					this.sendInitAwarenessInfo();
+					this.sendInitAwarenessInfo(event.data.f);
 					return;
 				case MessageDataType.Sync:
 					this.onClientSync(group, event.data);
@@ -30744,12 +30752,15 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 		};
 		this._conn = conn;
 	}
-	broadcast(group, u8) {
+	broadcast(group, from$1, u8) {
 		this._conn?.send(JSON.stringify({
 			type: MessageType.SendToGroup,
 			group,
 			noEcho: true,
-			data: { c: Buffer.from(u8).toString("base64") }
+			data: {
+				f: from$1,
+				c: Buffer.from(u8).toString("base64")
+			}
 		}));
 	}
 	send(group, to, u8) {
@@ -30779,7 +30790,7 @@ var WeaveStoreAzureWebPubSubSyncHost = class extends Emittery {
 			switch (messageType) {
 				case messageYjsSyncStep1:
 					writeVarUint(encoder, messageYjsSyncStep1);
-					readSyncMessage(decoder, encoder, this.doc, null);
+					readSyncMessage(decoder, encoder, this.doc, data.f);
 					if (length$1(encoder) > 1) this.send(group, data.f, toUint8Array(encoder));
 					break;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inditextech/weave-store-azure-web-pubsub",
-  "version": "0.40.2",
+  "version": "0.42.0",
   "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.40.2",
+    "@inditextech/weave-sdk": "0.42.0",
     "@koa/cors": "^5.0.0",
     "@types/express": "^5.0.1",
     "@types/ioredis": "^4.28.10",