@calimero-network/mero-js 25.0.5 → 25.0.7

package/dist/index.mjs

@@ -10190,14 +10190,15 @@ async function resolveRelayFromInvitation(input) {
   const addressable = candidates.filter(
     (n) => typeof n.relayUrl === "string" && n.relayUrl.length > 0
   );
-  if (addressable.length === 0) {
+  const [firstAddressable] = addressable;
+  if (firstAddressable === void 0) {
     return {
       ok: false,
       step: "no-relay-url",
       reason: "A node your invitation names can admit you, but the cloud knows no address for it yet, so there would be nothing to connect through afterwards. Try again shortly."
     };
   }
-  const chosen = addressable.find((n) => n.canExecute) ?? addressable.find((n) => n.fresh) ?? addressable[0];
+  const chosen = addressable.find((n) => n.canExecute) ?? addressable.find((n) => n.fresh) ?? firstAddressable;
   return {
     ok: true,
     relayUrl: chosen.relayUrl,
@@ -10562,7 +10563,10 @@ function newer(a, b) {
   return false;
 }
 function selectLatestBundle(bundles) {
-  return bundles.filter((b) => !b.yanked && typeof b.appVersion === "string" && b.appVersion.length > 0).reduce((best, b) => !best || newer(b.appVersion, best.appVersion) ? b : best, void 0);
+  return bundles.filter((b) => !b.yanked && typeof b.appVersion === "string" && b.appVersion.length > 0).reduce(
+    (best, b) => !best || newer(b.appVersion, best.appVersion) ? b : best,
+    void 0
+  );
 }
 async function fetchRegistryBundles(registryUrl, pkg, fetchFn = globalThis.fetch) {
   const url = `${registryUrl.replace(/\/+$/, "")}/api/v2/bundles?package=${encodeURIComponent(pkg)}`;
@@ -12073,6 +12077,14 @@ function getLockManager() {
   const locks = nav?.locks;
   return locks && typeof locks.request === "function" ? locks : null;
 }
+function nodeKeyOf(baseUrl) {
+  try {
+    const { origin: origin2, pathname } = new URL(baseUrl);
+    return origin2 === "null" ? baseUrl : origin2 + pathname.replace(/\/+$/, "");
+  } catch {
+    return baseUrl;
+  }
+}
 function expiresAtFromJwt(token, fallbackMs) {
   try {
     const parts = token.split(".");
@@ -12108,8 +12120,9 @@ var MeroJs = class {
       ...config
     };
     this.tokenStore = config.tokenStore ?? null;
+    this.nodeKey = nodeKeyOf(config.baseUrl);
+    this.tokenData = this.readStoredTokens();
     if (this.tokenStore) {
-      this.tokenData = this.tokenStore.getTokens();
       this.storeHoldsTokens = this.tokenData !== null;
       if (typeof window !== "undefined") window.addEventListener("storage", this.onStorage);
     }
@@ -12130,7 +12143,7 @@ var MeroJs = class {
       onTokenRefresh: async (newToken) => {
         if (this.tokenData) {
           this.tokenData.access_token = newToken;
-          this.persistTokens(this.tokenData);
+          this.persistTokens();
         }
       },
       onAuthRevoked: async () => {
@@ -12276,7 +12289,7 @@ var MeroJs = class {
         refresh_token: response.data.refresh_token,
         expires_at: expiresAtFromJwt(accessToken, Date.now() + 36e5)
       };
-      this.persistTokens(this.tokenData);
+      this.persistTokens();
       return this.tokenData;
     } catch (error) {
       throw new Error(
@@ -12284,11 +12297,21 @@ var MeroJs = class {
       );
     }
   }
-  persistTokens(data) {
-    if (!this.tokenStore) return;
-    this.tokenStore.setTokens(data);
+  persistTokens() {
+    if (!this.tokenStore || !this.tokenData) return;
+    this.tokenStore.setTokens({ ...this.tokenData, node_origin: this.nodeKey });
     this.storeHoldsTokens = this.tokenStore.getTokens() !== null;
   }
+  /** The stored bundle, only if this node issued it; a legacy or foreign entry reads as empty. */
+  readStoredTokens() {
+    const stored = this.tokenStore?.getTokens();
+    if (!stored || stored.node_origin !== this.nodeKey) return null;
+    return {
+      access_token: stored.access_token,
+      refresh_token: stored.refresh_token,
+      expires_at: stored.expires_at
+    };
+  }
   // Raw store read: an empty store is a logout, another node's bundle is not.
   signedOutElsewhere() {
     return this.storeHoldsTokens && !this.tokenStore?.getTokens();
@@ -12356,7 +12379,7 @@ var MeroJs = class {
       this.dropLocalTokens();
       throw new Error("Signed out in another tab");
     }
-    const stored = this.tokenStore?.getTokens() ?? null;
+    const stored = this.readStoredTokens();
     if (stored?.refresh_token) {
       this.storeHoldsTokens = true;
       this.tokenData = stored;
@@ -12389,7 +12412,7 @@ var MeroJs = class {
         refresh_token: response.data.refresh_token,
         expires_at: expiresAtFromJwt(accessToken, Date.now() + 36e5)
       };
-      this.persistTokens(this.tokenData);
+      this.persistTokens();
       return this.tokenData;
     } catch (error) {
       throw new Error(
@@ -12418,7 +12441,7 @@ var MeroJs = class {
   setTokenData(data) {
     const expiresAt = data.expires_at || expiresAtFromJwt(data.access_token, Date.now() + 36e5);
     this.tokenData = { ...data, expires_at: expiresAt };
-    this.persistTokens(this.tokenData);
+    this.persistTokens();
   }
   /**
    * Get the current token data (for debugging)
@@ -12481,7 +12504,8 @@ var LocalStorageTokenStore = class {
         return {
           access_token: parsed.access_token,
           refresh_token: parsed.refresh_token,
-          expires_at: typeof parsed.expires_at === "number" ? parsed.expires_at : Date.now() + 36e5
+          expires_at: typeof parsed.expires_at === "number" ? parsed.expires_at : Date.now() + 36e5,
+          ...typeof parsed.node_origin === "string" && { node_origin: parsed.node_origin }
         };
       }
       return null;