fix(server): defer validation error body change
This commit is contained in:
parent
ebe9dcf27e
commit
6fea0178eb
4 changed files with 1 additions and 28 deletions
|
|
@ -21,7 +21,6 @@ import { TuiApi } from "./groups/tui"
|
||||||
import { WorkspaceApi } from "./groups/workspace"
|
import { WorkspaceApi } from "./groups/workspace"
|
||||||
import { V2Api } from "./groups/v2"
|
import { V2Api } from "./groups/v2"
|
||||||
import { Authorization } from "./middleware/authorization"
|
import { Authorization } from "./middleware/authorization"
|
||||||
import { SchemaErrorMiddleware } from "./middleware/schema-error"
|
|
||||||
|
|
||||||
// SSE event schemas built from the BusEvent/SyncEvent registries.
|
// SSE event schemas built from the BusEvent/SyncEvent registries.
|
||||||
const EventSchema = Schema.Union(BusEvent.effectPayloads()).annotate({ identifier: "Event" })
|
const EventSchema = Schema.Union(BusEvent.effectPayloads()).annotate({ identifier: "Event" })
|
||||||
|
|
@ -30,7 +29,6 @@ const SyncEventSchemas = SyncEvent.effectPayloads()
|
||||||
export const RootHttpApi = HttpApi.make("opencode-root")
|
export const RootHttpApi = HttpApi.make("opencode-root")
|
||||||
.addHttpApi(ControlApi)
|
.addHttpApi(ControlApi)
|
||||||
.addHttpApi(GlobalApi)
|
.addHttpApi(GlobalApi)
|
||||||
.middleware(SchemaErrorMiddleware)
|
|
||||||
.middleware(Authorization)
|
.middleware(Authorization)
|
||||||
|
|
||||||
export const InstanceHttpApi = HttpApi.make("opencode-instance")
|
export const InstanceHttpApi = HttpApi.make("opencode-instance")
|
||||||
|
|
@ -49,7 +47,6 @@ export const InstanceHttpApi = HttpApi.make("opencode-instance")
|
||||||
.addHttpApi(V2Api)
|
.addHttpApi(V2Api)
|
||||||
.addHttpApi(TuiApi)
|
.addHttpApi(TuiApi)
|
||||||
.addHttpApi(WorkspaceApi)
|
.addHttpApi(WorkspaceApi)
|
||||||
.middleware(SchemaErrorMiddleware)
|
|
||||||
|
|
||||||
export const OpenCodeHttpApi = HttpApi.make("opencode")
|
export const OpenCodeHttpApi = HttpApi.make("opencode")
|
||||||
.addHttpApi(RootHttpApi)
|
.addHttpApi(RootHttpApi)
|
||||||
|
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
import { Effect } from "effect"
|
|
||||||
import { HttpServerResponse } from "effect/unstable/http"
|
|
||||||
import { HttpApiMiddleware } from "effect/unstable/httpapi"
|
|
||||||
|
|
||||||
export class SchemaErrorMiddleware extends HttpApiMiddleware.Service<SchemaErrorMiddleware>()(
|
|
||||||
"@opencode/ExperimentalHttpApiSchemaError",
|
|
||||||
) {}
|
|
||||||
|
|
||||||
export const schemaErrorLayer = HttpApiMiddleware.layerSchemaErrorTransform(SchemaErrorMiddleware, (error) => {
|
|
||||||
if (error.kind === "Body") return Effect.fail(error)
|
|
||||||
return Effect.succeed(
|
|
||||||
HttpServerResponse.jsonUnsafe(
|
|
||||||
{
|
|
||||||
data: {},
|
|
||||||
errors: [{ kind: error.kind, message: error.cause.message }],
|
|
||||||
success: false,
|
|
||||||
},
|
|
||||||
{ status: 400 },
|
|
||||||
),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
@ -84,7 +84,6 @@ import { compressionLayer } from "./middleware/compression"
|
||||||
import { corsVaryFix } from "./middleware/cors-vary"
|
import { corsVaryFix } from "./middleware/cors-vary"
|
||||||
import { errorLayer } from "./middleware/error"
|
import { errorLayer } from "./middleware/error"
|
||||||
import { fenceLayer } from "./middleware/fence"
|
import { fenceLayer } from "./middleware/fence"
|
||||||
import { schemaErrorLayer } from "./middleware/schema-error"
|
|
||||||
|
|
||||||
export const context = Context.makeUnsafe<unknown>(new Map())
|
export const context = Context.makeUnsafe<unknown>(new Map())
|
||||||
|
|
||||||
|
|
@ -115,7 +114,6 @@ const authOnlyRouterLayer = authorizationRouterMiddleware.layer.pipe(Layer.provi
|
||||||
const httpApiAuthLayer = authorizationLayer.pipe(Layer.provide(ServerAuth.Config.defaultLayer))
|
const httpApiAuthLayer = authorizationLayer.pipe(Layer.provide(ServerAuth.Config.defaultLayer))
|
||||||
const rootApiRoutes = HttpApiBuilder.layer(RootHttpApi).pipe(
|
const rootApiRoutes = HttpApiBuilder.layer(RootHttpApi).pipe(
|
||||||
Layer.provide([controlHandlers, globalHandlers]),
|
Layer.provide([controlHandlers, globalHandlers]),
|
||||||
Layer.provide(schemaErrorLayer),
|
|
||||||
Layer.provide(httpApiAuthLayer),
|
Layer.provide(httpApiAuthLayer),
|
||||||
)
|
)
|
||||||
const instanceRouterLayer = authorizationRouterMiddleware
|
const instanceRouterLayer = authorizationRouterMiddleware
|
||||||
|
|
@ -144,7 +142,6 @@ const instanceApiRoutes = HttpApiBuilder.layer(InstanceHttpApi).pipe(
|
||||||
tuiHandlers,
|
tuiHandlers,
|
||||||
workspaceHandlers,
|
workspaceHandlers,
|
||||||
]),
|
]),
|
||||||
Layer.provide(schemaErrorLayer),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const rawInstanceRoutes = Layer.mergeAll(ptyConnectRoute).pipe(Layer.provide(instanceRouterLayer))
|
const rawInstanceRoutes = Layer.mergeAll(ptyConnectRoute).pipe(Layer.provide(instanceRouterLayer))
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,7 @@ describe("sync HttpApi", () => {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns structured validation errors", async () => {
|
test.todo("returns structured validation errors", async () => {
|
||||||
await using tmp = await tmpdir({ git: true, config: { formatter: false, lsp: false } })
|
await using tmp = await tmpdir({ git: true, config: { formatter: false, lsp: false } })
|
||||||
const response = await ExperimentalHttpApiServer.webHandler().handler(
|
const response = await ExperimentalHttpApiServer.webHandler().handler(
|
||||||
new Request(`http://localhost${SyncPaths.history}`, {
|
new Request(`http://localhost${SyncPaths.history}`, {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue