From e9464f9cecf52d0980586407780ca6e4af40ccbc Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Thu, 12 Dec 2024 18:51:03 +0100
Subject: [PATCH] fix: correct keyexpr parsing in ChatUser and enhance message
 retrieval logging in ChatSession

---
 zenoh-ts/examples/chat/src/main.ts | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/zenoh-ts/examples/chat/src/main.ts b/zenoh-ts/examples/chat/src/main.ts
index 7827a37..7b8169a 100644
--- a/zenoh-ts/examples/chat/src/main.ts
+++ b/zenoh-ts/examples/chat/src/main.ts
@@ -19,10 +19,10 @@ class ChatUser {
 	}
 	public static fromKeyexpr(keyexpr: KeyExpr): ChatUser | null {
 		let parts = (keyexpr.toString()).split("/");
-		if (parts.length < 3 || parts[0] != "chat" || parts[2] != "user") {
+		if (parts.length < 3 || parts[0] != "chat" || parts[1] != "user") {
 			return null;
 		}
-		let username = parts[1];
+		let username = parts[2];
 		if (!validate_username(username)) {
 			return null;
 		}
@@ -69,8 +69,19 @@ class ChatSession {
 
 		let keyexpr = this.user.toKeyexpr();
 
-		let messages = await this.session.get("chat/messages");
-		log(`[Session] Retrieved messages: ${messages}`);
+		let receiver = await this.session.get("chat/messages") as Receiver;
+		log(`[Session] Get messages from chat/messages`);
+		let reply = await receiver.receive();
+		if (reply instanceof Reply) {
+			let resp = reply.result();
+			if (resp instanceof Sample) {
+				let payload = deserialize_string(resp.payload().buffer());
+				log(`[Session] GetSuccess from ${resp.keyexpr().toString()}, messages: ${payload}`);
+				this.messages = JSON.parse(payload);
+			}
+		} else {
+			log(`[Session] GetError ${reply}`);
+		}
 
 		this.messages_queryable = await this.session.declare_queryable("chat/messages", {
 			callback: (query: Query) => {
@@ -87,9 +98,9 @@ class ChatSession {
 
 		this.message_subscriber = await this.session.declare_subscriber("chat/user/*", (sample) => {
 			let message = deserialize_string(sample.payload().buffer());
+			log(`[Subscriber] Received message: ${message} from ${sample.keyexpr().toString()}`);
 			let user = ChatUser.fromKeyexpr(sample.keyexpr());
 			if (user) {
-				log(`[Subscriber] Received message: ${message} from ${user.toString()}`);
 				const timestamp = new Date().toISOString();
 				this.messages.push({ t: timestamp, u: user.username, m: message });
 				if (this.messageCallback) {