take named options in makeSessionHooks

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

src/state/session/__tests__/session-core-test.ts

@@ -425,11 +425,11 @@ describe('makeSessionHooks arm-latch + event mapping', () => {
       >()
     /* the hook only passes this through by identity; a stub bundle suffices */
     const bundle = {} as SessionBundle
-    const hooks = makeSessionHooks(
+    const hooks = makeSessionHooks({
       onSessionChange,
-      () => bundle,
+      getBundle: () => bundle,
-      () => DID,
+      getDid: () => DID,
-    )
+    })
     return {onSessionChange, bundle, hooks}
   }
 
@@ -528,11 +528,11 @@ describe('session-hook payload threading (pre-commit ordering)', () => {
         refreshedAccountAtHookTime = deriveRefreshedAccount(event, sessionData)
       },
     )
-    const hooks = makeSessionHooks(
+    const hooks = makeSessionHooks({
       onSessionChange,
-      () => ({}) as SessionBundle,
+      getBundle: () => ({}) as SessionBundle,
-      () => DID,
+      getDid: () => DID,
-    )
+    })
     session = new PasswordSession(sessionAccountToSessionData(makeAccount()), {
       ...hooks,
       fetch: asFetch(fetchMock),
@@ -573,11 +573,11 @@ describe('session-hook payload threading (pre-commit ordering)', () => {
         refreshedAccountAtHookTime = deriveRefreshedAccount(event, sessionData)
       },
     )
-    const hooks = makeSessionHooks(
+    const hooks = makeSessionHooks({
       onSessionChange,
-      () => ({}) as SessionBundle,
+      getBundle: () => ({}) as SessionBundle,
-      () => DID,
+      getDid: () => DID,
-    )
+    })
     const session = new PasswordSession(
       sessionAccountToSessionData(makeAccount()),
       {...hooks, fetch: asFetch(fetchMock)},
@@ -606,11 +606,11 @@ describe('session-hook payload threading (pre-commit ordering)', () => {
  */
 describe('disposeBundle kill-switch', () => {
   it('the injected fetch throws after disposeBundle', () => {
-    const hooks = makeSessionHooks(
+    const hooks = makeSessionHooks({
-      jest.fn(),
+      onSessionChange: jest.fn(),
-      () => ({}) as SessionBundle,
+      getBundle: () => ({}) as SessionBundle,
-      () => DID,
+      getDid: () => DID,
-    )
+    })
     /* the injected fetch is the kill-switch wrapper makeSessionHooks bakes in */
     const injectedFetch = hooks.fetch!
 
@@ -734,11 +734,11 @@ describe('PasswordSession.refresh through armed hooks', () => {
         (bundle: SessionBundle, did: string, event: AtpSessionEvent) => void
       >()
     const bundle = {} as SessionBundle
-    const hooks = makeSessionHooks(
+    const hooks = makeSessionHooks({
       onSessionChange,
-      () => bundle,
+      getBundle: () => bundle,
-      () => DID,
+      getDid: () => DID,
-    )
+    })
     /*
      * makeSessionHooks bakes in networkAwareFetch (the real global fetch);
      * override it with the mock while keeping the arm-latched callbacks (they
@@ -957,11 +957,11 @@ describe('a session destroyed or rejected during preparation', () => {
   })
 
   it('finishPreparation disposes and rethrows without running the snapshot', async () => {
-    const hooks = makeSessionHooks(
+    const hooks = makeSessionHooks({
-      jest.fn(),
+      onSessionChange: jest.fn(),
-      () => bundle,
+      getBundle: () => bundle,
-      () => DID,
+      getDid: () => DID,
-    )
+    })
     const session = new PasswordSession(
       sessionAccountToSessionData(makeAccount()),
       {...hooks, fetch: asFetch(makeMockFetch())},
@@ -997,11 +997,11 @@ describe('a throwing onSessionChange does not brick the session', () => {
       throw new Error('reducer side effect exploded')
     })
     let bundle!: SessionBundle
-    const hooks = makeSessionHooks(
+    const hooks = makeSessionHooks({
       onSessionChange,
-      () => bundle,
+      getBundle: () => bundle,
-      () => DID,
+      getDid: () => DID,
-    )
+    })
     const session = new PasswordSession(
       sessionAccountToSessionData(makeAccount()),
       {...hooks, fetch: asFetch(fetchMock)},

src/state/session/create-account.ts

@@ -58,11 +58,11 @@ export async function createSessionBundleAndCreateAccount(
 ): Promise<{account: SessionAccount; bundle: SessionBundle}> {
   let bundle!: SessionBundle
   let accountDid = ''
-  const hooks = makeSessionHooks(
+  const hooks = makeSessionHooks({
     onSessionChange,
-    () => bundle,
+    getBundle: () => bundle,
-    () => accountDid,
+    getDid: () => accountDid,
-  )
+  })
 
   const session = await PasswordSession.createAccount(
     {

src/state/session/session-core.ts

@@ -114,13 +114,19 @@ export type OnSessionChange = (
 /**
  * Hooks stay inert during initial session preparation. `kill()` disarms them
  * and disables the injected fetch so a disposed session cannot refresh or
- * dispatch. The bundle getters are deferred because hooks are created first.
+ * dispatch.
  */
-export function makeSessionHooks(
+export function makeSessionHooks({
-  onSessionChange: OnSessionChange,
+  onSessionChange,
-  getBundle: () => SessionBundle,
+  getBundle,
-  getDid: () => string,
+  getDid,
-) {
+}: {
+  onSessionChange: OnSessionChange
+  /** Deferred: hooks are created before the bundle exists. */
+  getBundle: () => SessionBundle
+  /** Deferred: hooks are created before the bundle exists. */
+  getDid: () => string
+}) {
   let armed = false
   let killed = false
   const dispatch = (event: AtpSessionEvent, sessionData?: SessionData) => {
@@ -247,11 +253,11 @@ export async function createSessionBundleAndResume(
 ): Promise<{account: SessionAccount; bundle: SessionBundle}> {
   const gates = features.refresh({strategy: 'prefer-low-latency'})
   let bundle!: SessionBundle
-  const hooks = makeSessionHooks(
+  const hooks = makeSessionHooks({
     onSessionChange,
-    () => bundle,
+    getBundle: () => bundle,
-    () => storedAccount.did,
+    getDid: () => storedAccount.did,
-  )
+  })
 
   let session: PasswordSession
   const sessionData = sessionAccountToSessionData(storedAccount)
@@ -326,11 +332,11 @@ export async function createSessionBundleAndLogin(
 ): Promise<{account: SessionAccount; bundle: SessionBundle}> {
   let bundle!: SessionBundle
   let accountDid = ''
-  const hooks = makeSessionHooks(
+  const hooks = makeSessionHooks({
     onSessionChange,
-    () => bundle,
+    getBundle: () => bundle,
-    () => accountDid,
+    getDid: () => accountDid,
-  )
+  })
 
   const session = await PasswordSession.login({
     ...hooks,
@@ -376,11 +382,11 @@ export function createSessionBundleFromStoredAccount(
   ) => boolean = () => true,
 ): {account: SessionAccount; bundle: SessionBundle} | undefined {
   let bundle!: SessionBundle
-  const hooks = makeSessionHooks(
+  const hooks = makeSessionHooks({
     onSessionChange,
-    () => bundle,
+    getBundle: () => bundle,
-    () => storedAccount.did,
+    getDid: () => storedAccount.did,
-  )
+  })
   const session = new PasswordSession(
     sessionAccountToSessionData(storedAccount),
     hooks,