@account-kit/signer 4.1.0 → 4.2.0

package/dist/esm/session/manager.d.ts

@@ -27,6 +27,7 @@ export declare class SessionManager {
     private eventEmitter;
     readonly expirationTimeMs: number;
     private store;
+    private clearSessionHandle;
     constructor(params: SessionManagerParams);
     getSessionUser: () => Promise<User | null>;
     clearSession: () => void;
@@ -42,5 +43,6 @@ export declare class SessionManager {
     initialize(): void;
     private getInitialState;
     private registerEventListeners;
+    private registerSessionExpirationHandler;
     private setSessionWithUserAndBundle;
 }

package/dist/esm/session/manager.js

@@ -48,6 +48,12 @@ export class SessionManager {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "clearSessionHandle", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
         Object.defineProperty(this, "getSessionUser", {
             enumerable: true,
             configurable: true,
@@ -98,6 +104,9 @@ export class SessionManager {
             writable: true,
             value: () => {
                 this.store.setState({ session: null });
+                if (this.clearSessionHandle) {
+                    clearTimeout(this.clearSessionHandle);
+                }
             }
         });
         Object.defineProperty(this, "setTemporarySession", {
@@ -148,9 +157,10 @@ export class SessionManager {
                  * We should revisit this later
                  */
                 if (session.expirationDateMs < Date.now()) {
-                    this.store.setState({ session: null });
+                    this.clearSession();
                     return null;
                 }
+                this.registerSessionExpirationHandler(session);
                 return session;
             }
         });
@@ -158,13 +168,13 @@ export class SessionManager {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: (session) => {
-                this.store.setState({
-                    session: {
-                        ...session,
-                        expirationDateMs: Date.now() + this.expirationTimeMs,
-                    },
-                });
+            value: (session_) => {
+                const session = {
+                    ...session_,
+                    expirationDateMs: Date.now() + this.expirationTimeMs,
+                };
+                this.registerSessionExpirationHandler(session);
+                this.store.setState({ session });
             }
         });
         Object.defineProperty(this, "registerEventListeners", {
@@ -197,7 +207,8 @@ export class SessionManager {
                     const oldSession = this.store.getState().session;
                     this.store.persist.rehydrate();
                     const newSession = this.store.getState().session;
-                    if (oldSession?.user.orgId !== newSession?.user.orgId ||
+                    if ((oldSession?.expirationDateMs ?? 0) < Date.now() ||
+                        oldSession?.user.orgId !== newSession?.user.orgId ||
                         oldSession?.user.userId !== newSession?.user.userId) {
                         // Initialize if the user has changed.
                         this.initialize();
@@ -205,6 +216,19 @@ export class SessionManager {
                 });
             }
         });
+        Object.defineProperty(this, "registerSessionExpirationHandler", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (session) => {
+                if (this.clearSessionHandle) {
+                    clearTimeout(this.clearSessionHandle);
+                }
+                this.clearSessionHandle = setTimeout(() => {
+                    this.clearSession();
+                }, Math.min(session.expirationDateMs - Date.now(), Math.pow(2, 31) - 1));
+            }
+        });
         Object.defineProperty(this, "setSessionWithUserAndBundle", {
             enumerable: true,
             configurable: true,

package/dist/esm/session/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/session/manager.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from \"eventemitter3\";\nimport { z } from \"zod\";\nimport {\n  createJSONStorage,\n  persist,\n  subscribeWithSelector,\n} from \"zustand/middleware\";\nimport { createStore, type Mutate, type StoreApi } from \"zustand/vanilla\";\nimport type { BaseSignerClient } from \"../client/base\";\nimport type { User } from \"../client/types\";\nimport { assertNever } from \"../utils/typeAssertions.js\";\nimport type { Session, SessionManagerEvents } from \"./types\";\n\nexport const DEFAULT_SESSION_MS = 15 * 60 * 1000; // 15 minutes\n\nexport const SessionManagerParamsSchema = z.object({\n  sessionKey: z.string().default(\"alchemy-signer-session\"),\n  storage: z\n    .enum([\"localStorage\", \"sessionStorage\"])\n    .default(\"localStorage\")\n    .or(z.custom<Storage>()),\n  expirationTimeMs: z\n    .number()\n    .default(DEFAULT_SESSION_MS)\n    .describe(\n      \"The time in milliseconds that a session should last before expiring [default: 15 minutes]\"\n    ),\n  client: z.custom<BaseSignerClient>(),\n});\n\nexport type SessionManagerParams = z.input<typeof SessionManagerParamsSchema>;\n\ntype SessionState = {\n  session: Session | null;\n};\n\ntype Store = Mutate<\n  StoreApi<SessionState>,\n  [[\"zustand/subscribeWithSelector\", never], [\"zustand/persist\", SessionState]]\n>;\n\nexport class SessionManager {\n  private sessionKey: string;\n  private client: BaseSignerClient;\n  private eventEmitter: EventEmitter<SessionManagerEvents>;\n  readonly expirationTimeMs: number;\n  private store: Store;\n\n  constructor(params: SessionManagerParams) {\n    const {\n      sessionKey,\n      storage: storageType,\n      expirationTimeMs,\n      client,\n    } = SessionManagerParamsSchema.parse(params);\n    this.sessionKey = sessionKey;\n    const storage =\n      typeof storageType === \"string\"\n        ? storageType === \"localStorage\"\n          ? localStorage\n          : sessionStorage\n        : storageType;\n    this.expirationTimeMs = expirationTimeMs;\n    this.client = client;\n    this.eventEmitter = new EventEmitter<SessionManagerEvents>();\n\n    this.store = createStore(\n      subscribeWithSelector(\n        persist(this.getInitialState, {\n          name: this.sessionKey,\n          storage: createJSONStorage<SessionState>(() => storage),\n        })\n      )\n    );\n\n    this.registerEventListeners();\n  }\n\n  public getSessionUser = async (): Promise<User | null> => {\n    const existingSession = this.getSession();\n    if (existingSession == null) {\n      return null;\n    }\n\n    switch (existingSession.type) {\n      case \"email\":\n      case \"oauth\": {\n        const connectedEventName =\n          existingSession.type === \"email\"\n            ? \"connectedEmail\"\n            : \"connectedOauth\";\n        const result = await this.client\n          .completeAuthWithBundle({\n            bundle: existingSession.bundle,\n            orgId: existingSession.user.orgId,\n            authenticatingType: existingSession.type,\n            connectedEventName,\n          })\n          .catch((e) => {\n            console.warn(\"Failed to load user from session\", e);\n            return null;\n          });\n\n        if (!result) {\n          this.clearSession();\n          return null;\n        }\n\n        return result;\n      }\n      case \"passkey\": {\n        // we don't need to do much here if we already have a user\n        // this will setup the client with the user context, but\n        // requests still have to be signed by the user on first request\n        // so this is fine\n        return this.client.lookupUserWithPasskey(existingSession.user);\n      }\n      default:\n        assertNever(\n          existingSession,\n          `Unknown session type: ${(existingSession as any).type}`\n        );\n    }\n  };\n\n  public clearSession = () => {\n    this.store.setState({ session: null });\n  };\n\n  public setTemporarySession = (session: { orgId: string }) => {\n    // temporary session must be placed in localStorage so that it can be accessed across tabs\n    localStorage.setItem(\n      `${this.sessionKey}:temporary`,\n      JSON.stringify(session)\n    );\n  };\n\n  public getTemporarySession = (): { orgId: string } | null => {\n    // temporary session must be placed in localStorage so that it can be accessed across tabs\n    const sessionStr = localStorage.getItem(`${this.sessionKey}:temporary`);\n\n    if (!sessionStr) {\n      return null;\n    }\n\n    return JSON.parse(sessionStr);\n  };\n\n  on = <E extends keyof SessionManagerEvents>(\n    event: E,\n    listener: SessionManagerEvents[E]\n  ) => {\n    this.eventEmitter.on(event, listener as any);\n\n    return () => this.eventEmitter.removeListener(event, listener as any);\n  };\n\n  private getSession = (): Session | null => {\n    const session = this.store.getState().session;\n\n    if (!session) {\n      return null;\n    }\n\n    /**\n     * TODO: this isn't really good enough\n     * A user's session could be about to expire and we would still return it\n     *\n     * Instead we should check if a session is about to expire and refresh it\n     * We should revisit this later\n     */\n    if (session.expirationDateMs < Date.now()) {\n      this.store.setState({ session: null });\n      return null;\n    }\n\n    return session;\n  };\n\n  private setSession = (\n    session:\n      | Omit<Extract<Session, { type: \"email\" | \"oauth\" }>, \"expirationDateMs\">\n      | Omit<Extract<Session, { type: \"passkey\" }>, \"expirationDateMs\">\n  ) => {\n    this.store.setState({\n      session: {\n        ...session,\n        expirationDateMs: Date.now() + this.expirationTimeMs,\n      },\n    });\n  };\n\n  public initialize() {\n    this.getSessionUser()\n      .then((user) => {\n        // once we complete auth we can update the state of the session to connected or disconnected\n        if (user) this.eventEmitter.emit(\"connected\", this.getSession()!);\n        else this.eventEmitter.emit(\"disconnected\");\n      })\n      .finally(() => {\n        this.eventEmitter.emit(\"initialized\");\n      });\n  }\n\n  private getInitialState(): SessionState {\n    return {\n      session: null,\n    };\n  }\n\n  private registerEventListeners = () => {\n    this.store.subscribe(\n      ({ session }) => session,\n      (session, prevSession) => {\n        if (session != null && prevSession == null) {\n          this.eventEmitter.emit(\"connected\", session);\n        } else if (session == null && prevSession != null) {\n          this.eventEmitter.emit(\"disconnected\");\n        }\n      }\n    );\n\n    this.client.on(\"disconnected\", () => this.clearSession());\n\n    this.client.on(\"connectedEmail\", (user, bundle) =>\n      this.setSessionWithUserAndBundle({ type: \"email\", user, bundle })\n    );\n\n    this.client.on(\"connectedPasskey\", (user) => {\n      const existingSession = this.getSession();\n      if (\n        existingSession != null &&\n        existingSession.type === \"passkey\" &&\n        existingSession.user.userId === user.userId\n      ) {\n        return;\n      }\n\n      this.setSession({ type: \"passkey\", user });\n    });\n\n    this.client.on(\"connectedOauth\", (user, bundle) =>\n      this.setSessionWithUserAndBundle({ type: \"oauth\", user, bundle })\n    );\n\n    // sync local state if persisted state has changed from another tab\n    window.addEventListener(\"focus\", () => {\n      const oldSession = this.store.getState().session;\n      this.store.persist.rehydrate();\n      const newSession = this.store.getState().session;\n      if (\n        oldSession?.user.orgId !== newSession?.user.orgId ||\n        oldSession?.user.userId !== newSession?.user.userId\n      ) {\n        // Initialize if the user has changed.\n        this.initialize();\n      }\n    });\n  };\n\n  private setSessionWithUserAndBundle = ({\n    type,\n    user,\n    bundle,\n  }: {\n    type: \"email\" | \"oauth\";\n    user: User;\n    bundle: string;\n  }) => {\n    const existingSession = this.getSession();\n    if (\n      existingSession != null &&\n      existingSession.type === type &&\n      existingSession.user.userId === user.userId &&\n      // if the bundle is different, then we've refreshed the session\n      // so we need to reset the session\n      existingSession.bundle === bundle\n    ) {\n      return;\n    }\n\n    this.setSession({ type, user, bundle });\n  };\n}\n"]}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/session/manager.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from \"eventemitter3\";\nimport { z } from \"zod\";\nimport {\n  createJSONStorage,\n  persist,\n  subscribeWithSelector,\n} from \"zustand/middleware\";\nimport { createStore, type Mutate, type StoreApi } from \"zustand/vanilla\";\nimport type { BaseSignerClient } from \"../client/base\";\nimport type { User } from \"../client/types\";\nimport { assertNever } from \"../utils/typeAssertions.js\";\nimport type { Session, SessionManagerEvents } from \"./types\";\n\nexport const DEFAULT_SESSION_MS = 15 * 60 * 1000; // 15 minutes\n\nexport const SessionManagerParamsSchema = z.object({\n  sessionKey: z.string().default(\"alchemy-signer-session\"),\n  storage: z\n    .enum([\"localStorage\", \"sessionStorage\"])\n    .default(\"localStorage\")\n    .or(z.custom<Storage>()),\n  expirationTimeMs: z\n    .number()\n    .default(DEFAULT_SESSION_MS)\n    .describe(\n      \"The time in milliseconds that a session should last before expiring [default: 15 minutes]\"\n    ),\n  client: z.custom<BaseSignerClient>(),\n});\n\nexport type SessionManagerParams = z.input<typeof SessionManagerParamsSchema>;\n\ntype SessionState = {\n  session: Session | null;\n};\n\ntype Store = Mutate<\n  StoreApi<SessionState>,\n  [[\"zustand/subscribeWithSelector\", never], [\"zustand/persist\", SessionState]]\n>;\n\nexport class SessionManager {\n  private sessionKey: string;\n  private client: BaseSignerClient;\n  private eventEmitter: EventEmitter<SessionManagerEvents>;\n  readonly expirationTimeMs: number;\n  private store: Store;\n  private clearSessionHandle: NodeJS.Timeout | null = null;\n\n  constructor(params: SessionManagerParams) {\n    const {\n      sessionKey,\n      storage: storageType,\n      expirationTimeMs,\n      client,\n    } = SessionManagerParamsSchema.parse(params);\n    this.sessionKey = sessionKey;\n    const storage =\n      typeof storageType === \"string\"\n        ? storageType === \"localStorage\"\n          ? localStorage\n          : sessionStorage\n        : storageType;\n    this.expirationTimeMs = expirationTimeMs;\n    this.client = client;\n    this.eventEmitter = new EventEmitter<SessionManagerEvents>();\n\n    this.store = createStore(\n      subscribeWithSelector(\n        persist(this.getInitialState, {\n          name: this.sessionKey,\n          storage: createJSONStorage<SessionState>(() => storage),\n        })\n      )\n    );\n\n    this.registerEventListeners();\n  }\n\n  public getSessionUser = async (): Promise<User | null> => {\n    const existingSession = this.getSession();\n    if (existingSession == null) {\n      return null;\n    }\n\n    switch (existingSession.type) {\n      case \"email\":\n      case \"oauth\": {\n        const connectedEventName =\n          existingSession.type === \"email\"\n            ? \"connectedEmail\"\n            : \"connectedOauth\";\n        const result = await this.client\n          .completeAuthWithBundle({\n            bundle: existingSession.bundle,\n            orgId: existingSession.user.orgId,\n            authenticatingType: existingSession.type,\n            connectedEventName,\n          })\n          .catch((e) => {\n            console.warn(\"Failed to load user from session\", e);\n            return null;\n          });\n\n        if (!result) {\n          this.clearSession();\n          return null;\n        }\n\n        return result;\n      }\n      case \"passkey\": {\n        // we don't need to do much here if we already have a user\n        // this will setup the client with the user context, but\n        // requests still have to be signed by the user on first request\n        // so this is fine\n        return this.client.lookupUserWithPasskey(existingSession.user);\n      }\n      default:\n        assertNever(\n          existingSession,\n          `Unknown session type: ${(existingSession as any).type}`\n        );\n    }\n  };\n\n  public clearSession = () => {\n    this.store.setState({ session: null });\n\n    if (this.clearSessionHandle) {\n      clearTimeout(this.clearSessionHandle);\n    }\n  };\n\n  public setTemporarySession = (session: { orgId: string }) => {\n    // temporary session must be placed in localStorage so that it can be accessed across tabs\n    localStorage.setItem(\n      `${this.sessionKey}:temporary`,\n      JSON.stringify(session)\n    );\n  };\n\n  public getTemporarySession = (): { orgId: string } | null => {\n    // temporary session must be placed in localStorage so that it can be accessed across tabs\n    const sessionStr = localStorage.getItem(`${this.sessionKey}:temporary`);\n\n    if (!sessionStr) {\n      return null;\n    }\n\n    return JSON.parse(sessionStr);\n  };\n\n  on = <E extends keyof SessionManagerEvents>(\n    event: E,\n    listener: SessionManagerEvents[E]\n  ) => {\n    this.eventEmitter.on(event, listener as any);\n\n    return () => this.eventEmitter.removeListener(event, listener as any);\n  };\n\n  private getSession = (): Session | null => {\n    const session = this.store.getState().session;\n\n    if (!session) {\n      return null;\n    }\n\n    /**\n     * TODO: this isn't really good enough\n     * A user's session could be about to expire and we would still return it\n     *\n     * Instead we should check if a session is about to expire and refresh it\n     * We should revisit this later\n     */\n    if (session.expirationDateMs < Date.now()) {\n      this.clearSession();\n      return null;\n    }\n\n    this.registerSessionExpirationHandler(session);\n\n    return session;\n  };\n\n  private setSession = (\n    session_:\n      | Omit<Extract<Session, { type: \"email\" | \"oauth\" }>, \"expirationDateMs\">\n      | Omit<Extract<Session, { type: \"passkey\" }>, \"expirationDateMs\">\n  ) => {\n    const session = {\n      ...session_,\n      expirationDateMs: Date.now() + this.expirationTimeMs,\n    };\n\n    this.registerSessionExpirationHandler(session);\n\n    this.store.setState({ session });\n  };\n\n  public initialize() {\n    this.getSessionUser()\n      .then((user) => {\n        // once we complete auth we can update the state of the session to connected or disconnected\n        if (user) this.eventEmitter.emit(\"connected\", this.getSession()!);\n        else this.eventEmitter.emit(\"disconnected\");\n      })\n      .finally(() => {\n        this.eventEmitter.emit(\"initialized\");\n      });\n  }\n\n  private getInitialState(): SessionState {\n    return {\n      session: null,\n    };\n  }\n\n  private registerEventListeners = () => {\n    this.store.subscribe(\n      ({ session }) => session,\n      (session, prevSession) => {\n        if (session != null && prevSession == null) {\n          this.eventEmitter.emit(\"connected\", session);\n        } else if (session == null && prevSession != null) {\n          this.eventEmitter.emit(\"disconnected\");\n        }\n      }\n    );\n\n    this.client.on(\"disconnected\", () => this.clearSession());\n\n    this.client.on(\"connectedEmail\", (user, bundle) =>\n      this.setSessionWithUserAndBundle({ type: \"email\", user, bundle })\n    );\n\n    this.client.on(\"connectedPasskey\", (user) => {\n      const existingSession = this.getSession();\n      if (\n        existingSession != null &&\n        existingSession.type === \"passkey\" &&\n        existingSession.user.userId === user.userId\n      ) {\n        return;\n      }\n\n      this.setSession({ type: \"passkey\", user });\n    });\n\n    this.client.on(\"connectedOauth\", (user, bundle) =>\n      this.setSessionWithUserAndBundle({ type: \"oauth\", user, bundle })\n    );\n\n    // sync local state if persisted state has changed from another tab\n    window.addEventListener(\"focus\", () => {\n      const oldSession = this.store.getState().session;\n      this.store.persist.rehydrate();\n      const newSession = this.store.getState().session;\n      if (\n        (oldSession?.expirationDateMs ?? 0) < Date.now() ||\n        oldSession?.user.orgId !== newSession?.user.orgId ||\n        oldSession?.user.userId !== newSession?.user.userId\n      ) {\n        // Initialize if the user has changed.\n        this.initialize();\n      }\n    });\n  };\n\n  private registerSessionExpirationHandler = (session: Session) => {\n    if (this.clearSessionHandle) {\n      clearTimeout(this.clearSessionHandle);\n    }\n\n    this.clearSessionHandle = setTimeout(() => {\n      this.clearSession();\n    }, Math.min(session.expirationDateMs - Date.now(), Math.pow(2, 31) - 1));\n  };\n\n  private setSessionWithUserAndBundle = ({\n    type,\n    user,\n    bundle,\n  }: {\n    type: \"email\" | \"oauth\";\n    user: User;\n    bundle: string;\n  }) => {\n    const existingSession = this.getSession();\n    if (\n      existingSession != null &&\n      existingSession.type === type &&\n      existingSession.user.userId === user.userId &&\n      // if the bundle is different, then we've refreshed the session\n      // so we need to reset the session\n      existingSession.bundle === bundle\n    ) {\n      return;\n    }\n\n    this.setSession({ type, user, bundle });\n  };\n}\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.1.0";
+export declare const VERSION = "4.2.0";

package/dist/esm/version.js

@@ -1,4 +1,4 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "4.1.0";
+export const VERSION = "4.2.0";
 //# sourceMappingURL=version.js.map

package/dist/esm/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.1.0\";\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.2.0\";\n"]}

package/dist/types/session/manager.d.ts

@@ -27,6 +27,7 @@ export declare class SessionManager {
     private eventEmitter;
     readonly expirationTimeMs: number;
     private store;
+    private clearSessionHandle;
     constructor(params: SessionManagerParams);
     getSessionUser: () => Promise<User | null>;
     clearSession: () => void;
@@ -42,6 +43,7 @@ export declare class SessionManager {
     initialize(): void;
     private getInitialState;
     private registerEventListeners;
+    private registerSessionExpirationHandler;
     private setSessionWithUserAndBundle;
 }
 //# sourceMappingURL=manager.d.ts.map

package/dist/types/session/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/session/manager.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,EAAW,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE7D,eAAO,MAAM,kBAAkB,QAAiB,CAAC;AAEjD,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;EAarC,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAW9E,qBAAa,cAAc;IACzB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,YAAY,CAAqC;IACzD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,OAAO,CAAC,KAAK,CAAQ;gBAET,MAAM,EAAE,oBAAoB;IA8BjC,cAAc,QAAa,QAAQ,IAAI,GAAG,IAAI,CAAC,CA6CpD;IAEK,YAAY,aAEjB;IAEK,mBAAmB,YAAa;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,UAMtD;IAEK,mBAAmB,QAAO;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CASvD;IAEF,EAAE,uIAOA;IAEF,OAAO,CAAC,UAAU,CAoBhB;IAEF,OAAO,CAAC,UAAU,CAWhB;IAEK,UAAU;IAYjB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,sBAAsB,CAgD5B;IAEF,OAAO,CAAC,2BAA2B,CAsBjC;CACH"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/session/manager.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,EAAW,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE7D,eAAO,MAAM,kBAAkB,QAAiB,CAAC;AAEjD,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;EAarC,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAW9E,qBAAa,cAAc;IACzB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,YAAY,CAAqC;IACzD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,kBAAkB,CAA+B;gBAE7C,MAAM,EAAE,oBAAoB;IA8BjC,cAAc,QAAa,QAAQ,IAAI,GAAG,IAAI,CAAC,CA6CpD;IAEK,YAAY,aAMjB;IAEK,mBAAmB,YAAa;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,UAMtD;IAEK,mBAAmB,QAAO;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CASvD;IAEF,EAAE,uIAOA;IAEF,OAAO,CAAC,UAAU,CAsBhB;IAEF,OAAO,CAAC,UAAU,CAahB;IAEK,UAAU;IAYjB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,sBAAsB,CAiD5B;IAEF,OAAO,CAAC,gCAAgC,CAQtC;IAEF,OAAO,CAAC,2BAA2B,CAsBjC;CACH"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "4.1.0";
+export declare const VERSION = "4.2.0";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/signer",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Core interfaces and clients for interfacing with the Alchemy Signer API",
   "author": "Alchemy",
   "license": "MIT",
@@ -48,8 +48,8 @@
     "vitest": "^2.0.4"
   },
   "dependencies": {
-    "@aa-sdk/core": "^4.1.0",
-    "@account-kit/logging": "^4.1.0",
+    "@aa-sdk/core": "^4.2.0",
+    "@account-kit/logging": "^4.2.0",
     "@turnkey/http": "^2.6.2",
     "@turnkey/iframe-stamper": "^1.0.0",
     "@turnkey/viem": "^0.4.8",
@@ -72,5 +72,5 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "f6b6f15f4fe349850995264a549ca53a821859f0"
+  "gitHead": "c797c8143221d84f67df30d56b61c9950f5ea890"
 }

package/src/session/manager.ts

@@ -45,6 +45,7 @@ export class SessionManager {
   private eventEmitter: EventEmitter<SessionManagerEvents>;
   readonly expirationTimeMs: number;
   private store: Store;
+  private clearSessionHandle: NodeJS.Timeout | null = null;
 
   constructor(params: SessionManagerParams) {
     const {
@@ -125,6 +126,10 @@ export class SessionManager {
 
   public clearSession = () => {
     this.store.setState({ session: null });
+
+    if (this.clearSessionHandle) {
+      clearTimeout(this.clearSessionHandle);
+    }
   };
 
   public setTemporarySession = (session: { orgId: string }) => {
@@ -170,24 +175,28 @@ export class SessionManager {
      * We should revisit this later
      */
     if (session.expirationDateMs < Date.now()) {
-      this.store.setState({ session: null });
+      this.clearSession();
       return null;
     }
 
+    this.registerSessionExpirationHandler(session);
+
     return session;
   };
 
   private setSession = (
-    session:
+    session_:
       | Omit<Extract<Session, { type: "email" | "oauth" }>, "expirationDateMs">
       | Omit<Extract<Session, { type: "passkey" }>, "expirationDateMs">
   ) => {
-    this.store.setState({
-      session: {
-        ...session,
-        expirationDateMs: Date.now() + this.expirationTimeMs,
-      },
-    });
+    const session = {
+      ...session_,
+      expirationDateMs: Date.now() + this.expirationTimeMs,
+    };
+
+    this.registerSessionExpirationHandler(session);
+
+    this.store.setState({ session });
   };
 
   public initialize() {
@@ -249,6 +258,7 @@ export class SessionManager {
       this.store.persist.rehydrate();
       const newSession = this.store.getState().session;
       if (
+        (oldSession?.expirationDateMs ?? 0) < Date.now() ||
         oldSession?.user.orgId !== newSession?.user.orgId ||
         oldSession?.user.userId !== newSession?.user.userId
       ) {
@@ -258,6 +268,16 @@ export class SessionManager {
     });
   };
 
+  private registerSessionExpirationHandler = (session: Session) => {
+    if (this.clearSessionHandle) {
+      clearTimeout(this.clearSessionHandle);
+    }
+
+    this.clearSessionHandle = setTimeout(() => {
+      this.clearSession();
+    }, Math.min(session.expirationDateMs - Date.now(), Math.pow(2, 31) - 1));
+  };
+
   private setSessionWithUserAndBundle = ({
     type,
     user,

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "4.1.0";
+export const VERSION = "4.2.0";