@calimero-network/mero-js 24.0.0 → 24.1.1

package/dist/index.cjs

@@ -3021,6 +3021,7 @@ function isGroupMigrationEvent(event) {
 // src/events/sse.ts
 var TERMINAL_AUTH_ERRORS2 = /* @__PURE__ */ new Set(["token_reuse", "token_revoked"]);
 var TERMINAL_AUTH_STATUSES = /* @__PURE__ */ new Set([401, 403]);
+var SUBSCRIPTION_TIMEOUT_MS = 1e4;
 function isTerminalAuthFailure(response) {
   const authError = response.headers.get("x-auth-error");
   if (!authError) return null;
@@ -3205,15 +3206,21 @@ var SseClient = class {
     try {
       const msg = JSON.parse(jsonStr);
       if (msg.type === "connect" && msg.session_id) {
-        this.sessionId = msg.session_id;
-        this.emit("connect", msg.session_id);
+        const sessionId = msg.session_id;
+        this.sessionId = sessionId;
         this.presence.clear();
-        if (this.subscribedContextIds.size > 0 || this.subscribedGroupIds.size > 0) {
-          this.sendSubscription("subscribe", {
-            contextIds: [...this.subscribedContextIds],
-            groupIds: [...this.subscribedGroupIds]
-          });
+        if (this.subscribedContextIds.size === 0 && this.subscribedGroupIds.size === 0) {
+          this.emit("connect", sessionId);
+          return;
         }
+        void this.postSubscription("subscribe", {
+          contextIds: [...this.subscribedContextIds],
+          groupIds: [...this.subscribedGroupIds]
+        }).then((failure) => {
+          if (this.closed || this.sessionId !== sessionId) return;
+          this.emit("connect", sessionId);
+          if (failure) this.emit("error", failure);
+        });
         return;
       }
       if (!msg.result) return;
@@ -3302,6 +3309,16 @@ var SseClient = class {
     }
   }
   async sendSubscription(method, ids) {
+    const failure = await this.postSubscription(method, ids);
+    if (failure) this.emit("error", failure);
+  }
+  /** Sends one subscription change and returns why it failed, or `null`. */
+  async postSubscription(method, ids) {
+    const timeout = new AbortController();
+    const timer = setTimeout(
+      () => timeout.abort(new DOMException(`SSE ${method} timed out`, "TimeoutError")),
+      SUBSCRIPTION_TIMEOUT_MS
+    );
     try {
       const params = {};
       if (ids.contextIds && ids.contextIds.length > 0) params.contextIds = ids.contextIds;
@@ -3314,31 +3331,32 @@ var SseClient = class {
           ...await this.authorize({ method: "POST", path: new URL(url).pathname, body }),
           "Content-Type": "application/json"
         },
-        body
+        body,
+        signal: timeout.signal
       });
       if (!response.ok) {
         const terminal = isTerminalAuthFailure(response);
         const bodyText = await response.text().catch(() => void 0);
-        this.emit(
-          "error",
-          terminal ? new AuthRevokedError(
-            terminal,
-            response.status,
-            response.statusText,
-            `${this.baseUrl}/sse/subscription`,
-            response.headers,
-            bodyText
-          ) : new HTTPError(
-            response.status,
-            response.statusText,
-            `${this.baseUrl}/sse/subscription`,
-            response.headers,
-            bodyText
-          )
+        return terminal ? new AuthRevokedError(
+          terminal,
+          response.status,
+          response.statusText,
+          `${this.baseUrl}/sse/subscription`,
+          response.headers,
+          bodyText
+        ) : new HTTPError(
+          response.status,
+          response.statusText,
+          `${this.baseUrl}/sse/subscription`,
+          response.headers,
+          bodyText
         );
       }
+      return null;
     } catch (err) {
-      this.emit("error", err instanceof Error ? err : new Error(`SSE ${method} failed`));
+      return err instanceof Error ? err : new Error(`SSE ${method} failed`);
+    } finally {
+      clearTimeout(timer);
     }
   }
   forceReconnect() {
@@ -3817,7 +3835,8 @@ async function mintDeviceId(account, nonce2) {
     throw new Error(`nonce must be 16 bytes, got ${nonce2.length}`);
   }
   const accountBytes = fromHex(account, "account", 32);
-  return hex(await domainHash(DEVICE_ID_DOMAIN, [accountBytes, nonce2]));
+  const binding = await domainHash(DEVICE_ID_DOMAIN, [accountBytes, nonce2]);
+  return hex(concat(nonce2, binding.subarray(0, 16)));
 }
 async function deviceCertPayload(input) {
   return domainHash(CERT_DOMAIN, [
@@ -11212,6 +11231,20 @@ function teeRoleOf(row) {
 function pickExecutingRelay(relays) {
   return relays.find((r) => r.canExecute && r.relayUrl !== null && r.executorAccount !== null) ?? null;
 }
+function joinOf(row) {
+  const raw = row.join;
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
+  const join = raw;
+  if (typeof join.state !== "string") return null;
+  const refusals = Array.isArray(join.refusals) ? join.refusals.filter((r) => !!r && typeof r === "object").map((r) => ({ peer: String(r.peer ?? ""), reason: String(r.reason ?? "") })) : [];
+  return {
+    state: join.state,
+    attempts: typeof join.attempts === "number" ? join.attempts : 0,
+    refusals,
+    error: typeof join.error === "string" ? join.error : null,
+    reportedAt: typeof join.reported_at === "string" ? join.reported_at : null
+  };
+}
 var ACCOUNT_HEX = /^[0-9a-f]{64}$/;
 function accountHexOrNull(value) {
   return typeof value === "string" && ACCOUNT_HEX.test(value) ? value : null;
@@ -11451,7 +11484,10 @@ var CloudClient = class {
           authorshipReady && relayUrl !== null && executorAccount !== null
         ),
         lastSeenAt: row.last_seen_at ?? null,
-        confirmedAt: row.confirmed_at ?? null
+        confirmedAt: row.confirmed_at ?? null,
+        admission: typeof row.admission === "string" ? row.admission : null,
+        admissionHint: typeof row.admission_hint === "string" ? row.admission_hint : null,
+        join: joinOf(row)
       };
     });
   }