@calimero-network/mero-js 7.0.5 → 7.1.1

package/dist/index.cjs

@@ -1584,6 +1584,7 @@ var SseClient = class {
     this.abortController = null;
     this.reconnectTimer = null;
     this.subscribedContextIds = /* @__PURE__ */ new Set();
+    this.subscribedGroupIds = /* @__PURE__ */ new Set();
     this.closed = false;
     this.listeners = { connect: [], event: [], error: [] };
     this.baseUrl = opts.baseUrl.replace(/\/+$/, "");
@@ -1706,21 +1707,25 @@ var SseClient = class {
       if (msg.type === "connect" && msg.session_id) {
         this.sessionId = msg.session_id;
         this.emit("connect", msg.session_id);
-        if (this.subscribedContextIds.size > 0) {
-          this.sendSubscription("subscribe", [...this.subscribedContextIds]);
+        if (this.subscribedContextIds.size > 0 || this.subscribedGroupIds.size > 0) {
+          this.sendSubscription("subscribe", {
+            contextIds: [...this.subscribedContextIds],
+            groupIds: [...this.subscribedGroupIds]
+          });
         }
         return;
       }
-      if (msg.result && msg.result.contextId) {
-        let eventData = msg.result.data;
-        if (Array.isArray(eventData)) {
-          try {
-            const bytes = new Uint8Array(eventData);
-            const text = new TextDecoder().decode(bytes);
-            eventData = JSON.parse(text);
-          } catch {
-          }
+      if (!msg.result) return;
+      let eventData = msg.result.data;
+      if (Array.isArray(eventData)) {
+        try {
+          const bytes = new Uint8Array(eventData);
+          const text = new TextDecoder().decode(bytes);
+          eventData = JSON.parse(text);
+        } catch {
         }
+      }
+      if (msg.result.contextId) {
         this.emit("event", {
           contextId: msg.result.contextId,
           // Forward the event tag (sibling of `data` in core's flattened
@@ -1728,31 +1733,52 @@ var SseClient = class {
           type: msg.result.type,
           data: eventData
         });
+        return;
+      }
+      if (msg.result.groupId) {
+        this.emit("event", {
+          groupId: msg.result.groupId,
+          type: msg.result.type,
+          data: eventData
+        });
       }
     } catch {
     }
   }
-  async subscribe(contextIds) {
-    const newIds = contextIds.filter((id) => !this.subscribedContextIds.has(id));
-    for (const id of contextIds) {
+  async subscribe(idsOrOpts) {
+    const opts = Array.isArray(idsOrOpts) ? { contextIds: idsOrOpts } : idsOrOpts;
+    const newContextIds = (opts.contextIds ?? []).filter((id) => !this.subscribedContextIds.has(id));
+    const newGroupIds = (opts.groupIds ?? []).filter((id) => !this.subscribedGroupIds.has(id));
+    for (const id of opts.contextIds ?? []) {
       this.subscribedContextIds.add(id);
     }
-    if (newIds.length > 0 && this.sessionId) {
-      await this.sendSubscription("subscribe", newIds);
+    for (const id of opts.groupIds ?? []) {
+      this.subscribedGroupIds.add(id);
+    }
+    if ((newContextIds.length > 0 || newGroupIds.length > 0) && this.sessionId) {
+      await this.sendSubscription("subscribe", { contextIds: newContextIds, groupIds: newGroupIds });
     }
   }
-  async unsubscribe(contextIds) {
-    const hadIds = contextIds.filter((id) => this.subscribedContextIds.has(id));
-    for (const id of contextIds) {
+  async unsubscribe(idsOrOpts) {
+    const opts = Array.isArray(idsOrOpts) ? { contextIds: idsOrOpts } : idsOrOpts;
+    const hadContextIds = (opts.contextIds ?? []).filter((id) => this.subscribedContextIds.has(id));
+    const hadGroupIds = (opts.groupIds ?? []).filter((id) => this.subscribedGroupIds.has(id));
+    for (const id of opts.contextIds ?? []) {
       this.subscribedContextIds.delete(id);
     }
-    if (hadIds.length > 0 && this.sessionId) {
-      await this.sendSubscription("unsubscribe", hadIds);
+    for (const id of opts.groupIds ?? []) {
+      this.subscribedGroupIds.delete(id);
+    }
+    if ((hadContextIds.length > 0 || hadGroupIds.length > 0) && this.sessionId) {
+      await this.sendSubscription("unsubscribe", { contextIds: hadContextIds, groupIds: hadGroupIds });
     }
   }
-  async sendSubscription(method, contextIds) {
+  async sendSubscription(method, ids) {
     try {
       const token = await this.getAuthToken();
+      const params = {};
+      if (ids.contextIds && ids.contextIds.length > 0) params.contextIds = ids.contextIds;
+      if (ids.groupIds && ids.groupIds.length > 0) params.groupIds = ids.groupIds;
       const response = await fetch(`${this.baseUrl}/sse/subscription`, {
         method: "POST",
         headers: {
@@ -1762,7 +1788,7 @@ var SseClient = class {
         body: JSON.stringify({
           id: this.sessionId,
           method,
-          params: { contextIds }
+          params
         })
       });
       if (!response.ok) {
@@ -1802,6 +1828,7 @@ var SseClient = class {
     }
     this.sessionId = null;
     this.subscribedContextIds.clear();
+    this.subscribedGroupIds.clear();
   }
 };
 
@@ -1813,6 +1840,7 @@ var _WsClient = class _WsClient {
     this.reconnectAttempt = 0;
     this.reconnectTimer = null;
     this.subscribedContextIds = /* @__PURE__ */ new Set();
+    this.subscribedGroupIds = /* @__PURE__ */ new Set();
     this.listeners = { connect: [], event: [], error: [] };
     this.baseUrl = opts.baseUrl.replace(/\/+$/, "");
     this.getAuthToken = opts.getAuthToken;
@@ -1844,7 +1872,7 @@ var _WsClient = class _WsClient {
     }
   }
   async connect() {
-    if (this.ws && (this.ws.readyState === WebSocket.CONNECTING || this.ws.readyState === WebSocket.OPEN)) {
+    if (this.ws && (this.ws.readyState === 0 || this.ws.readyState === 1)) {
       return;
     }
     this.closed = false;
@@ -1858,13 +1886,7 @@ var _WsClient = class _WsClient {
       this.ws.onopen = () => {
         this.reconnectAttempt = 0;
         this.emit("connect");
-        if (this.subscribedContextIds.size > 0) {
-          this.sendMessage({
-            id: null,
-            method: "subscribe",
-            params: { contextIds: [...this.subscribedContextIds] }
-          });
-        }
+        this.resubscribeAfterReconnect();
       };
       this.ws.onmessage = (event) => {
         this.handleMessage(event.data);
@@ -1888,16 +1910,17 @@ var _WsClient = class _WsClient {
     if (typeof raw !== "string") return;
     try {
       const msg = JSON.parse(raw);
-      if (msg.result && msg.result.contextId) {
-        let eventData = msg.result.data;
-        if (Array.isArray(eventData)) {
-          try {
-            const bytes = new Uint8Array(eventData);
-            const text = new TextDecoder().decode(bytes);
-            eventData = JSON.parse(text);
-          } catch {
-          }
+      if (!msg.result) return;
+      let eventData = msg.result.data;
+      if (Array.isArray(eventData)) {
+        try {
+          const bytes = new Uint8Array(eventData);
+          const text = new TextDecoder().decode(bytes);
+          eventData = JSON.parse(text);
+        } catch {
         }
+      }
+      if (msg.result.contextId) {
         this.emit("event", {
           contextId: msg.result.contextId,
           // Forward the event tag (sibling of `data` in core's flattened
@@ -1905,36 +1928,66 @@ var _WsClient = class _WsClient {
           type: msg.result.type,
           data: eventData
         });
+        return;
+      }
+      if (msg.result.groupId) {
+        this.emit("event", {
+          groupId: msg.result.groupId,
+          type: msg.result.type,
+          data: eventData
+        });
       }
     } catch {
     }
   }
-  subscribe(contextIds) {
-    for (const id of contextIds) {
+  subscribe(idsOrOpts) {
+    const opts = Array.isArray(idsOrOpts) ? { contextIds: idsOrOpts } : idsOrOpts;
+    for (const id of opts.contextIds ?? []) {
       this.subscribedContextIds.add(id);
     }
-    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+    for (const id of opts.groupIds ?? []) {
+      this.subscribedGroupIds.add(id);
+    }
+    if (this.ws && this.ws.readyState === 1) {
       this.sendMessage({
         id: null,
         method: "subscribe",
-        params: { contextIds }
+        params: this.buildSubscriptionParams(opts.contextIds ?? [], opts.groupIds ?? [])
       });
     }
   }
-  unsubscribe(contextIds) {
-    for (const id of contextIds) {
+  unsubscribe(idsOrOpts) {
+    const opts = Array.isArray(idsOrOpts) ? { contextIds: idsOrOpts } : idsOrOpts;
+    for (const id of opts.contextIds ?? []) {
       this.subscribedContextIds.delete(id);
     }
-    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+    for (const id of opts.groupIds ?? []) {
+      this.subscribedGroupIds.delete(id);
+    }
+    if (this.ws && this.ws.readyState === 1) {
       this.sendMessage({
         id: null,
         method: "unsubscribe",
-        params: { contextIds }
+        params: this.buildSubscriptionParams(opts.contextIds ?? [], opts.groupIds ?? [])
       });
     }
   }
+  resubscribeAfterReconnect() {
+    if (this.subscribedContextIds.size === 0 && this.subscribedGroupIds.size === 0) return;
+    this.sendMessage({
+      id: null,
+      method: "subscribe",
+      params: this.buildSubscriptionParams([...this.subscribedContextIds], [...this.subscribedGroupIds])
+    });
+  }
+  buildSubscriptionParams(contextIds, groupIds) {
+    const params = {};
+    if (contextIds.length > 0) params.contextIds = contextIds;
+    if (groupIds.length > 0) params.groupIds = groupIds;
+    return params;
+  }
   sendMessage(msg) {
-    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+    if (this.ws && this.ws.readyState === 1) {
       this.ws.send(JSON.stringify(msg));
     }
   }
@@ -1965,6 +2018,7 @@ var _WsClient = class _WsClient {
       this.ws = null;
     }
     this.subscribedContextIds.clear();
+    this.subscribedGroupIds.clear();
   }
 };
 _WsClient.MAX_BACKOFF_MS = 3e4;