@calimero-network/mero-js 25.0.6 → 25.0.7

package/dist/index.mjs

@@ -12077,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(".");
@@ -12112,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);
     }
@@ -12134,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 () => {
@@ -12280,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(
@@ -12288,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();
@@ -12360,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;
@@ -12393,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(
@@ -12422,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)
@@ -12485,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;