Skip to content

fix(app): detect session-not-found across legacy error shapes #48013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CannonRS wants to merge 1 commit into
base: dev
Choose a base branch
from
+19 −2
Open

fix(app): detect session-not-found across legacy error shapes #48013

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions packages/app/src/utils/server-errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,31 @@ export function sessionNotFoundError(sessionID: string) {
}

export function isLocalSessionNotFoundError(error: unknown, sessionID: string) {
return error instanceof Error && error.message === sessionNotFoundMessage(sessionID)
if (error instanceof Error && error.message === sessionNotFoundMessage(sessionID)) return true
if (typeof error === "string" && error.includes(sessionNotFoundMessage(sessionID))) return true
return false
}

export function isSessionNotFoundError(error: unknown, sessionID: string) {
if (isLocalSessionNotFoundError(error, sessionID)) return true
const unwrapped = unwrapNamedError(error)
if (typeof unwrapped !== "object" || unwrapped === null) return false
const value = unwrapped as Record<string, unknown>
return value._tag === "SessionNotFoundError" && value.sessionID === sessionID
if (value._tag === "SessionNotFoundError" && value.sessionID === sessionID) return true
if (
value.name === "NotFoundError" &&
typeof value.data === "object" &&
value.data !== null &&
(value.data as Record<string, unknown>).message === sessionNotFoundMessage(sessionID)
)
return true
if (
"message" in value &&
typeof value.message === "string" &&
value.message.includes(sessionNotFoundMessage(sessionID))
)
return true
return false
}

function isConfigInvalidErrorLike(error: unknown): error is ConfigInvalidError {
Expand Down
Loading