Skip to content

Commit 4b04171

Browse files
authored
fix(server): remove storage not found defect fallback (anomalyco#27287)
1 parent b0dc8e4 commit 4b04171

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

packages/opencode/src/server/routes/instance/httpapi/middleware/error.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Provider } from "@/provider/provider"
22
import { Session } from "@/session/session"
3-
import { NotFoundError } from "@/storage/storage"
43
import { iife } from "@/util/iife"
54
import { NamedError } from "@opencode-ai/core/util/error"
65
import * as Log from "@opencode-ai/core/util/log"
@@ -24,10 +23,6 @@ export const errorLayer = HttpRouter.middleware<{ handles: unknown }>()((effect)
2423
const error = defect.defect
2524
log.error("failed", { error, cause: Cause.pretty(cause) })
2625

27-
if (error instanceof NotFoundError) {
28-
return Effect.succeed(HttpServerResponse.jsonUnsafe(error.toObject(), { status: 404 }))
29-
}
30-
3126
if (error instanceof NamedError) {
3227
return Effect.succeed(
3328
HttpServerResponse.jsonUnsafe(error.toObject(), {

packages/opencode/test/server/httpapi-error-middleware.test.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { describe, expect } from "bun:test"
33
import { Effect, Layer } from "effect"
44
import { HttpClient, HttpClientRequest, HttpRouter } from "effect/unstable/http"
55
import { errorLayer } from "../../src/server/routes/instance/httpapi/middleware/error"
6+
import { NotFoundError } from "../../src/storage/storage"
67
import { testEffect } from "../lib/effect"
78

89
const it = testEffect(Layer.mergeAll(NodeHttpServer.layerTest, NodeServices.layer))
@@ -27,4 +28,23 @@ describe("HttpApi error middleware", () => {
2728
expect(JSON.stringify(body)).not.toContain("secret stack marker")
2829
}),
2930
)
31+
32+
it.live("does not map storage not-found defects to 404", () =>
33+
Effect.gen(function* () {
34+
yield* HttpRouter.add(
35+
"GET",
36+
"/missing",
37+
Effect.die(new NotFoundError({ message: "Resource not found: secret" })),
38+
).pipe(Layer.provide(errorLayer), HttpRouter.serve, Layer.build)
39+
40+
const response = yield* HttpClientRequest.get("/missing").pipe(HttpClient.execute)
41+
const body = yield* response.json
42+
43+
expect(response.status).toBe(500)
44+
expect(body).toEqual({
45+
name: "UnknownError",
46+
data: { message: "Unexpected server error. Check server logs for details." },
47+
})
48+
}),
49+
)
3050
})

0 commit comments

Comments
 (0)