Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions apps/raycast-extension/src/api-error.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { describe, expect, it } from "bun:test"
import { extractApiErrorMessage } from "./api-error"

describe("extractApiErrorMessage", () => {
it("reads the API's standard error field", () => {
expect(extractApiErrorMessage('{"error":"Memory limit reached"}')).toBe(
"Memory limit reached",
)
})

it("falls back to the message field", () => {
expect(extractApiErrorMessage('{"message":"Invalid request"}')).toBe(
"Invalid request",
)
})

it("preserves plain-text error responses", () => {
expect(extractApiErrorMessage("Service unavailable")).toBe(
"Service unavailable",
)
})

it.each([
"",
" ",
"{}",
'{"error":""}',
])("ignores an empty or unrecognized body", (raw) => {
expect(extractApiErrorMessage(raw)).toBeUndefined()
})
})
19 changes: 19 additions & 0 deletions apps/raycast-extension/src/api-error.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export function extractApiErrorMessage(raw: string): string | undefined {
const body = raw.trim()
if (!body) return undefined

try {
const parsed: unknown = JSON.parse(body)
if (parsed && typeof parsed === "object") {
const error = Reflect.get(parsed, "error")
if (typeof error === "string" && error.trim()) return error

const message = Reflect.get(parsed, "message")
if (typeof message === "string" && message.trim()) return message
}
} catch {
return body
}

return undefined
}
13 changes: 5 additions & 8 deletions apps/raycast-extension/src/api.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { getPreferenceValues, showToast, Toast } from "@raycast/api"
import { extractApiErrorMessage } from "./api-error"

export interface Project {
id: string
Expand Down Expand Up @@ -101,14 +102,10 @@ async function makeAuthenticatedRequest<T>(
}

let errorMessage = `API request failed: ${response.statusText}`
try {
const errorBody = (await response.json()) as { message?: string }
if (errorBody.message) {
errorMessage = errorBody.message
}
} catch {
// Ignore JSON parsing errors, use default message
}
const responseMessage = extractApiErrorMessage(
await response.text().catch(() => ""),
)
if (responseMessage) errorMessage = responseMessage

throw new SupermemoryAPIError(errorMessage, response.status)
}
Expand Down