fix session retry

Author: chrisvander

package.json

@@ -1,6 +1,6 @@
 {
   "name": "at-astro",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": false,
   "description": "An Astro integration for the AT Protocol, implementing OAuth flow and publishing an authenticated client to fetch and mutate records.",
   "keywords": [

src/lib/atproto-client.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, expect, mock, spyOn, test } from "bun:test"
-import { OAuthResolverError } from "@atproto/oauth-client"
+import { OAuthResolverError, TokenRefreshError } from "@atproto/oauth-client"
 import type { AtAstroSession } from "../types/session"
 
 const restore = mock()
@@ -12,6 +12,7 @@ beforeEach(() => {
 void mock.module("at-astro:config", () => ({
   config: {
     didSessionKey: "at-astro:did",
+    oauthSessionPrefix: "at-astro:oauth:",
     publicEndpoint: "https://public.api.bsky.app",
   },
 }))
@@ -72,3 +73,26 @@ test("does not report a handle lookup failure as a signed-out session", async ()
   resolve.mockRejectedValueOnce(error)
   expect(getClient(session)).rejects.toBe(error)
 })
+
+test("clears a deleted OAuth session and returns a public client", async () => {
+  const values = new Map<string, string>([
+    ["at-astro:did", "did:plc:test"],
+    ["at-astro:oauth:did:plc:test", "stale credentials"],
+    ["preference", "keep"],
+  ])
+  const storedSession = {
+    get: async (key: string) => values.get(key),
+    delete: (key: string) => {
+      values.delete(key)
+    },
+  } as unknown as AtAstroSession
+  restore.mockRejectedValueOnce(
+    new TokenRefreshError("did:plc:test", "The session was deleted by another process"),
+  )
+
+  expect(await getClient(storedSession)).toMatchObject({ did: null, handle: null })
+  expect([...values]).toEqual([["preference", "keep"]])
+  expect(resolve).not.toHaveBeenCalled()
+  expect(await getClient(storedSession)).toMatchObject({ did: null, handle: null })
+  expect(restore).toHaveBeenCalledTimes(1)
+})

src/lib/atproto-client.ts

@@ -1,5 +1,5 @@
 import { Client } from "@atproto/lex"
-import { OAuthResolverError } from "@atproto/oauth-client"
+import { OAuthResolverError, TokenRefreshError } from "@atproto/oauth-client"
 import { getOAuthClient } from "./atproto-oauth"
 import { config } from "at-astro:config"
 import type { AtAstroSession } from "../types/session"
@@ -34,6 +34,11 @@ export async function getClient(session: AtAstroSession | undefined): Promise<{
     const { handle } = await oauthClient.identityResolver.resolve(did)
     return { client, did, handle: handle == "handle.invalid" ? null : handle }
   } catch (error) {
+    if (error instanceof TokenRefreshError) {
+      session.delete(config.didSessionKey)
+      session.delete(`${config.oauthSessionPrefix}${did}`)
+      return getPublicClient()
+    }
     if (!(error instanceof OAuthResolverError)) throw error
     console.error("Failed to restore AT Protocol session", error)
     return getPublicClient()