@owney/sdk 0.6.6-beta.4 → 0.6.6-beta.6

package/dist/index.cjs

@@ -550,36 +550,52 @@ var isJwtExpired = (token) => {
     return false;
   }
 };
+var memorySessions = /* @__PURE__ */ new Map();
+var isFreshSession = (session) => !!session && !!session.token && !isJwtExpired(session.token);
 var readSession = (address, chainId) => {
+  if (typeof window === "undefined") return null;
+  const key = buildKey(address, chainId);
   const store = storage();
-  if (!store) return null;
-  const raw = store.getItem(buildKey(address, chainId));
-  if (!raw) return null;
+  let raw = null;
   try {
-    const parsed = JSON.parse(raw);
-    if (!parsed.token || isJwtExpired(parsed.token)) {
-      store.removeItem(buildKey(address, chainId));
-      return null;
-    }
-    return parsed;
+    raw = store?.getItem(key) ?? null;
   } catch {
-    store.removeItem(buildKey(address, chainId));
+    raw = null;
+  }
+  if (raw) {
+    try {
+      const parsed = JSON.parse(raw);
+      if (isFreshSession(parsed)) return parsed;
+    } catch {
+    }
+    memorySessions.delete(key);
+    try {
+      store?.removeItem(key);
+    } catch {
+    }
     return null;
   }
+  const cached = memorySessions.get(key);
+  if (isFreshSession(cached)) return cached;
+  if (cached) memorySessions.delete(key);
+  return null;
 };
 var writeSession = (address, chainId, session) => {
+  if (typeof window === "undefined") return;
+  const key = buildKey(address, chainId);
+  memorySessions.set(key, session);
   const store = storage();
-  if (!store) return;
   try {
-    store.setItem(buildKey(address, chainId), JSON.stringify(session));
+    store?.setItem(key, JSON.stringify(session));
   } catch {
   }
 };
 var clearSession = (address, chainId) => {
+  const key = buildKey(address, chainId);
+  memorySessions.delete(key);
   const store = storage();
-  if (!store) return;
   try {
-    store.removeItem(buildKey(address, chainId));
+    store?.removeItem(key);
   } catch {
   }
 };
@@ -625,6 +641,10 @@ var WETH_ADDRESS_BY_CHAIN = {
   1: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
 };
 var VIEM_CHAIN = { 8453: import_chains.base, 42161: import_chains.arbitrum, 1: import_chains.mainnet };
+function isAlreadyActiveSessionKeyError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return /already has an active session key/i.test(message);
+}
 var ZyfaiAgent = class {
   id = "zyfai";
   supportedChainIds = [8453, 42161, 1];
@@ -898,7 +918,12 @@ var ZyfaiAgent = class {
     if (wasSessionKeyActivated(address, chainId)) return;
     const internals = this.sdk;
     internals.hasActiveSessionKey = false;
-    await this.sdk.createSessionKey(address, chainId);
+    try {
+      await this.sdk.createSessionKey(address, chainId);
+    } catch (error) {
+      if (!isAlreadyActiveSessionKeyError(error)) throw error;
+      internals.hasActiveSessionKey = true;
+    }
     markSessionKeyActivated(address, chainId);
   }
   /** Connect + resolve smart wallet address for read operations. */
@@ -2702,31 +2727,47 @@ var storage2 = () => {
   }
 };
 var buildKey2 = (address, chainId) => `${KEY_PREFIX2}:${address.toLowerCase()}:${chainId}`;
+var memorySiwxSessions = /* @__PURE__ */ new Map();
 var readSiwxSession = (address, chainId) => {
+  if (typeof window === "undefined") return null;
+  const key = buildKey2(address, chainId);
   const store = storage2();
-  if (!store) return null;
-  const raw = store.getItem(buildKey2(address, chainId));
-  if (!raw) return null;
+  let raw = null;
   try {
-    return JSON.parse(raw);
+    raw = store?.getItem(key) ?? null;
   } catch {
-    store.removeItem(buildKey2(address, chainId));
-    return null;
+    raw = null;
   }
+  if (raw) {
+    try {
+      return JSON.parse(raw);
+    } catch {
+      memorySiwxSessions.delete(key);
+      try {
+        store?.removeItem(key);
+      } catch {
+      }
+      return null;
+    }
+  }
+  return memorySiwxSessions.get(key) ?? null;
 };
 var writeSiwxSession = (address, chainId, session) => {
+  if (typeof window === "undefined") return;
+  const key = buildKey2(address, chainId);
+  memorySiwxSessions.set(key, session);
   const store = storage2();
-  if (!store) return;
   try {
-    store.setItem(buildKey2(address, chainId), JSON.stringify(session));
+    store?.setItem(key, JSON.stringify(session));
   } catch {
   }
 };
 var clearSiwxSession = (address, chainId) => {
+  const key = buildKey2(address, chainId);
+  memorySiwxSessions.delete(key);
   const store = storage2();
-  if (!store) return;
   try {
-    store.removeItem(buildKey2(address, chainId));
+    store?.removeItem(key);
   } catch {
   }
 };

package/dist/index.js

@@ -518,36 +518,52 @@ var isJwtExpired = (token) => {
     return false;
   }
 };
+var memorySessions = /* @__PURE__ */ new Map();
+var isFreshSession = (session) => !!session && !!session.token && !isJwtExpired(session.token);
 var readSession = (address, chainId) => {
+  if (typeof window === "undefined") return null;
+  const key = buildKey(address, chainId);
   const store = storage();
-  if (!store) return null;
-  const raw = store.getItem(buildKey(address, chainId));
-  if (!raw) return null;
+  let raw = null;
   try {
-    const parsed = JSON.parse(raw);
-    if (!parsed.token || isJwtExpired(parsed.token)) {
-      store.removeItem(buildKey(address, chainId));
-      return null;
-    }
-    return parsed;
+    raw = store?.getItem(key) ?? null;
   } catch {
-    store.removeItem(buildKey(address, chainId));
+    raw = null;
+  }
+  if (raw) {
+    try {
+      const parsed = JSON.parse(raw);
+      if (isFreshSession(parsed)) return parsed;
+    } catch {
+    }
+    memorySessions.delete(key);
+    try {
+      store?.removeItem(key);
+    } catch {
+    }
     return null;
   }
+  const cached = memorySessions.get(key);
+  if (isFreshSession(cached)) return cached;
+  if (cached) memorySessions.delete(key);
+  return null;
 };
 var writeSession = (address, chainId, session) => {
+  if (typeof window === "undefined") return;
+  const key = buildKey(address, chainId);
+  memorySessions.set(key, session);
   const store = storage();
-  if (!store) return;
   try {
-    store.setItem(buildKey(address, chainId), JSON.stringify(session));
+    store?.setItem(key, JSON.stringify(session));
   } catch {
   }
 };
 var clearSession = (address, chainId) => {
+  const key = buildKey(address, chainId);
+  memorySessions.delete(key);
   const store = storage();
-  if (!store) return;
   try {
-    store.removeItem(buildKey(address, chainId));
+    store?.removeItem(key);
   } catch {
   }
 };
@@ -593,6 +609,10 @@ var WETH_ADDRESS_BY_CHAIN = {
   1: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
 };
 var VIEM_CHAIN = { 8453: base, 42161: arbitrum, 1: mainnet };
+function isAlreadyActiveSessionKeyError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return /already has an active session key/i.test(message);
+}
 var ZyfaiAgent = class {
   id = "zyfai";
   supportedChainIds = [8453, 42161, 1];
@@ -866,7 +886,12 @@ var ZyfaiAgent = class {
     if (wasSessionKeyActivated(address, chainId)) return;
     const internals = this.sdk;
     internals.hasActiveSessionKey = false;
-    await this.sdk.createSessionKey(address, chainId);
+    try {
+      await this.sdk.createSessionKey(address, chainId);
+    } catch (error) {
+      if (!isAlreadyActiveSessionKeyError(error)) throw error;
+      internals.hasActiveSessionKey = true;
+    }
     markSessionKeyActivated(address, chainId);
   }
   /** Connect + resolve smart wallet address for read operations. */
@@ -2674,31 +2699,47 @@ var storage2 = () => {
   }
 };
 var buildKey2 = (address, chainId) => `${KEY_PREFIX2}:${address.toLowerCase()}:${chainId}`;
+var memorySiwxSessions = /* @__PURE__ */ new Map();
 var readSiwxSession = (address, chainId) => {
+  if (typeof window === "undefined") return null;
+  const key = buildKey2(address, chainId);
   const store = storage2();
-  if (!store) return null;
-  const raw = store.getItem(buildKey2(address, chainId));
-  if (!raw) return null;
+  let raw = null;
   try {
-    return JSON.parse(raw);
+    raw = store?.getItem(key) ?? null;
   } catch {
-    store.removeItem(buildKey2(address, chainId));
-    return null;
+    raw = null;
   }
+  if (raw) {
+    try {
+      return JSON.parse(raw);
+    } catch {
+      memorySiwxSessions.delete(key);
+      try {
+        store?.removeItem(key);
+      } catch {
+      }
+      return null;
+    }
+  }
+  return memorySiwxSessions.get(key) ?? null;
 };
 var writeSiwxSession = (address, chainId, session) => {
+  if (typeof window === "undefined") return;
+  const key = buildKey2(address, chainId);
+  memorySiwxSessions.set(key, session);
   const store = storage2();
-  if (!store) return;
   try {
-    store.setItem(buildKey2(address, chainId), JSON.stringify(session));
+    store?.setItem(key, JSON.stringify(session));
   } catch {
   }
 };
 var clearSiwxSession = (address, chainId) => {
+  const key = buildKey2(address, chainId);
+  memorySiwxSessions.delete(key);
   const store = storage2();
-  if (!store) return;
   try {
-    store.removeItem(buildKey2(address, chainId));
+    store?.removeItem(key);
   } catch {
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.6.6-beta.4",
+  "version": "0.6.6-beta.6",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",