@owney/sdk 0.6.6-beta.5 → 0.6.6-beta.7

package/dist/index.cjs

@@ -599,33 +599,17 @@ var clearSession = (address, chainId) => {
   } catch {
   }
 };
-var SESSION_KEY_PREFIX = "owney.zyfai.sessionkey";
-var buildSessionKeyKey = (address, chainId) => `${SESSION_KEY_PREFIX}:${address.toLowerCase()}:${chainId}`;
-var wasSessionKeyActivated = (address, chainId) => {
-  const store = storage();
-  if (!store) return false;
-  try {
-    return store.getItem(buildSessionKeyKey(address, chainId)) === "1";
-  } catch {
-    return false;
-  }
-};
-var markSessionKeyActivated = (address, chainId) => {
-  const store = storage();
-  if (!store) return;
-  try {
-    store.setItem(buildSessionKeyKey(address, chainId), "1");
-  } catch {
-  }
-};
 
 // src/agents/zyfai/autoSelect.ts
-function buildAutoSelectUpdate(current, asset) {
-  if (current.autoSelectProtocols === true) return null;
+function buildAutoSelectUpdate(current, asset, chainId) {
+  const chains = current.chains ?? [];
+  const chainMissing = chainId !== void 0 && !chains.includes(chainId);
+  if (current.autoSelectProtocols === true && !chainMissing) return null;
+  const nextChains = chainMissing ? [...chains, chainId] : chains;
   return {
     asset,
     autoSelectProtocols: true,
-    ...current.chains ? { chains: current.chains } : {}
+    ...nextChains.length ? { chains: nextChains } : {}
   };
 }
 
@@ -641,6 +625,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];
@@ -889,33 +877,45 @@ var ZyfaiAgent = class {
         );
       }
     }
-    await this.ensureSessionKey(address, validChainId);
+    await this.ensureSessionKey(state, address, validChainId);
   }
   /**
-   * Ensures a session key is active for THIS chain.
+   * Ensures the user has an active session key, creating one if absent.
    *
-   * The Zyfai SDK tracks session-key state with a single global boolean — the
-   * in-memory `hasActiveSessionKey` and the `/users/me` field of the same name
-   * are neither chain-scoped. Once a key is activated on one chain, both
-   * `getUserDetails()` and the SDK's own `createSessionKey` guard report
-   * "active" on every other chain, so a deposit on a freshly-used chain runs
-   * without a valid session key and reverts. See [[zyfai-per-chain-session-key]].
+   * The Zyfai session key is a single **per-user** record, not per-chain: its
+   * config (`/session-keys/config`) spans every supported chain and is signed
+   * in one shot, and the backend rejects `POST /session-keys/add` with 400
+   * "User already has an active session key" if one exists. So we must NOT try
+   * to (re)create a key per chain — that 400s and blocks the deposit. We only
+   * create when the user has none.
    *
-   * We keep our own per-(address, chainId) record of activated chains (in
-   * localStorage). On a miss we clear the SDK's global guard so
-   * `createSessionKey` actually signs and activates for THIS chain.
+   * The one wrapper-side hardening that IS needed: a chain/account switch can
+   * fire the provider's `accountsChanged` → `disconnectAccount`, tearing down
+   * the zyfai connection (walletClient + authenticatedUserId both null) while
+   * our own `connectAuth` guard still believes this chain is connected and
+   * early-returns without reconnecting. `createSessionKey` then fails with
+   * "No account connected". Detect that and reconnect first.
    *
-   * Cost: on a chain we've never recorded (e.g. a key created on another device
-   * or a prior app version), this forces one `createSessionKey` — an extra
-   * wallet signature, idempotent on the backend. A prompt-free variant would
-   * read the session-validator module state on-chain instead of self-tracking.
+   * NOTE: whether a globally-active session key actually authorizes activity on
+   * a freshly-deployed Safe on a new chain is a backend/zyf question — the
+   * wrapper cannot force per-chain activation given the global 400 guard.
+   * See [[zyfai-per-chain-session-key]].
    */
-  async ensureSessionKey(address, chainId) {
-    if (wasSessionKeyActivated(address, chainId)) return;
+  async ensureSessionKey(state, address, chainId) {
     const internals = this.sdk;
-    internals.hasActiveSessionKey = false;
-    await this.sdk.createSessionKey(address, chainId);
-    markSessionKeyActivated(address, chainId);
+    if (!internals.walletClient || internals.authenticatedUserId === null) {
+      this.connectedChainId = null;
+      await this.connectAuth(state, chainId);
+    }
+    const user = await this.sdk.getUserDetails();
+    if (!user.hasActiveSessionKey) {
+      try {
+        await this.sdk.createSessionKey(address, chainId);
+      } catch (error) {
+        if (!isAlreadyActiveSessionKeyError(error)) throw error;
+        internals.hasActiveSessionKey = true;
+      }
+    }
   }
   /** Connect + resolve smart wallet address for read operations. */
   async resolveSmartWallet(state, chainId) {
@@ -1065,7 +1065,7 @@ var ZyfaiAgent = class {
     await this.connectAuth(state, chainId);
     const validChainId = isValidChainId(chainId);
     const raw = await this.sdk.getUserDetails();
-    await this.ensureSessionKey(this.getAddress(), validChainId);
+    await this.ensureSessionKey(state, this.getAddress(), validChainId);
     return mapUserProfile(raw, this.connectedAddress);
   }
   async ensureAutoSelectProtocols(state, chainId, asset) {
@@ -1076,7 +1076,8 @@ var ZyfaiAgent = class {
         autoSelectProtocols: current.autoSelectProtocols,
         chains: current.chains
       },
-      asset
+      asset,
+      isValidChainId(chainId)
     );
     if (!update) return false;
     await this.sdk.updateUserProfile(update);

package/dist/index.js

@@ -567,33 +567,17 @@ var clearSession = (address, chainId) => {
   } catch {
   }
 };
-var SESSION_KEY_PREFIX = "owney.zyfai.sessionkey";
-var buildSessionKeyKey = (address, chainId) => `${SESSION_KEY_PREFIX}:${address.toLowerCase()}:${chainId}`;
-var wasSessionKeyActivated = (address, chainId) => {
-  const store = storage();
-  if (!store) return false;
-  try {
-    return store.getItem(buildSessionKeyKey(address, chainId)) === "1";
-  } catch {
-    return false;
-  }
-};
-var markSessionKeyActivated = (address, chainId) => {
-  const store = storage();
-  if (!store) return;
-  try {
-    store.setItem(buildSessionKeyKey(address, chainId), "1");
-  } catch {
-  }
-};
 
 // src/agents/zyfai/autoSelect.ts
-function buildAutoSelectUpdate(current, asset) {
-  if (current.autoSelectProtocols === true) return null;
+function buildAutoSelectUpdate(current, asset, chainId) {
+  const chains = current.chains ?? [];
+  const chainMissing = chainId !== void 0 && !chains.includes(chainId);
+  if (current.autoSelectProtocols === true && !chainMissing) return null;
+  const nextChains = chainMissing ? [...chains, chainId] : chains;
   return {
     asset,
     autoSelectProtocols: true,
-    ...current.chains ? { chains: current.chains } : {}
+    ...nextChains.length ? { chains: nextChains } : {}
   };
 }
 
@@ -609,6 +593,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];
@@ -857,33 +845,45 @@ var ZyfaiAgent = class {
         );
       }
     }
-    await this.ensureSessionKey(address, validChainId);
+    await this.ensureSessionKey(state, address, validChainId);
   }
   /**
-   * Ensures a session key is active for THIS chain.
+   * Ensures the user has an active session key, creating one if absent.
    *
-   * The Zyfai SDK tracks session-key state with a single global boolean — the
-   * in-memory `hasActiveSessionKey` and the `/users/me` field of the same name
-   * are neither chain-scoped. Once a key is activated on one chain, both
-   * `getUserDetails()` and the SDK's own `createSessionKey` guard report
-   * "active" on every other chain, so a deposit on a freshly-used chain runs
-   * without a valid session key and reverts. See [[zyfai-per-chain-session-key]].
+   * The Zyfai session key is a single **per-user** record, not per-chain: its
+   * config (`/session-keys/config`) spans every supported chain and is signed
+   * in one shot, and the backend rejects `POST /session-keys/add` with 400
+   * "User already has an active session key" if one exists. So we must NOT try
+   * to (re)create a key per chain — that 400s and blocks the deposit. We only
+   * create when the user has none.
    *
-   * We keep our own per-(address, chainId) record of activated chains (in
-   * localStorage). On a miss we clear the SDK's global guard so
-   * `createSessionKey` actually signs and activates for THIS chain.
+   * The one wrapper-side hardening that IS needed: a chain/account switch can
+   * fire the provider's `accountsChanged` → `disconnectAccount`, tearing down
+   * the zyfai connection (walletClient + authenticatedUserId both null) while
+   * our own `connectAuth` guard still believes this chain is connected and
+   * early-returns without reconnecting. `createSessionKey` then fails with
+   * "No account connected". Detect that and reconnect first.
    *
-   * Cost: on a chain we've never recorded (e.g. a key created on another device
-   * or a prior app version), this forces one `createSessionKey` — an extra
-   * wallet signature, idempotent on the backend. A prompt-free variant would
-   * read the session-validator module state on-chain instead of self-tracking.
+   * NOTE: whether a globally-active session key actually authorizes activity on
+   * a freshly-deployed Safe on a new chain is a backend/zyf question — the
+   * wrapper cannot force per-chain activation given the global 400 guard.
+   * See [[zyfai-per-chain-session-key]].
    */
-  async ensureSessionKey(address, chainId) {
-    if (wasSessionKeyActivated(address, chainId)) return;
+  async ensureSessionKey(state, address, chainId) {
     const internals = this.sdk;
-    internals.hasActiveSessionKey = false;
-    await this.sdk.createSessionKey(address, chainId);
-    markSessionKeyActivated(address, chainId);
+    if (!internals.walletClient || internals.authenticatedUserId === null) {
+      this.connectedChainId = null;
+      await this.connectAuth(state, chainId);
+    }
+    const user = await this.sdk.getUserDetails();
+    if (!user.hasActiveSessionKey) {
+      try {
+        await this.sdk.createSessionKey(address, chainId);
+      } catch (error) {
+        if (!isAlreadyActiveSessionKeyError(error)) throw error;
+        internals.hasActiveSessionKey = true;
+      }
+    }
   }
   /** Connect + resolve smart wallet address for read operations. */
   async resolveSmartWallet(state, chainId) {
@@ -1033,7 +1033,7 @@ var ZyfaiAgent = class {
     await this.connectAuth(state, chainId);
     const validChainId = isValidChainId(chainId);
     const raw = await this.sdk.getUserDetails();
-    await this.ensureSessionKey(this.getAddress(), validChainId);
+    await this.ensureSessionKey(state, this.getAddress(), validChainId);
     return mapUserProfile(raw, this.connectedAddress);
   }
   async ensureAutoSelectProtocols(state, chainId, asset) {
@@ -1044,7 +1044,8 @@ var ZyfaiAgent = class {
         autoSelectProtocols: current.autoSelectProtocols,
         chains: current.chains
       },
-      asset
+      asset,
+      isValidChainId(chainId)
     );
     if (!update) return false;
     await this.sdk.updateUserProfile(update);

package/package.json

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