Skip to content

Commit 195f592

Browse files
authored
refactor(server): simplify listener lifecycle (#27413)
1 parent 7876901 commit 195f592

20 files changed

Lines changed: 444 additions & 211 deletions

‎packages/opencode/package.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
"bun": "./src/pty/pty.bun.ts",
3333
"node": "./src/pty/pty.node.ts",
3434
"default": "./src/pty/pty.bun.ts"
35-
},
36-
"#httpapi-server": {
37-
"bun": "./src/server/httpapi-server.node.ts",
38-
"node": "./src/server/httpapi-server.node.ts",
39-
"default": "./src/server/httpapi-server.node.ts"
4035
}
4136
},
4237
"devDependencies": {

‎packages/opencode/src/server/httpapi-server.node.ts‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎packages/opencode/src/server/httpapi-server.ts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎packages/opencode/src/server/projectors.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,3 @@ export function initProjectors() {
2424
},
2525
})
2626
}
27-
28-
initProjectors()

‎packages/opencode/src/server/routes/instance/httpapi/server.ts‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Context, Effect, Layer } from "effect"
1+
import { Config as EffectConfig, Context, Effect, Layer } from "effect"
22
import { HttpApiBuilder, OpenApi } from "effect/unstable/httpapi"
33
import {
44
FetchHttpClient,
@@ -90,15 +90,6 @@ import { schemaErrorLayer } from "./middleware/schema-error"
9090

9191
export const context = Context.makeUnsafe<unknown>(new Map())
9292

93-
const runtime = HttpRouter.middleware()(
94-
Effect.succeed((effect) =>
95-
Effect.gen(function* () {
96-
yield* Effect.annotateCurrentSpan({ "opencode.server.backend": "effect-httpapi" })
97-
return yield* effect
98-
}),
99-
),
100-
).layer
101-
10293
const cors = (corsOptions?: CorsOptions) =>
10394
HttpRouter.middleware(
10495
HttpMiddleware.cors({
@@ -180,15 +171,23 @@ const uiRoute = HttpRouter.use((router) =>
180171
}),
181172
).pipe(Layer.provide(authOnlyRouterLayer))
182173

183-
export function createRoutes(corsOptions?: CorsOptions) {
174+
type RouteRequirements =
175+
| HttpRouter.HttpRouter
176+
| HttpRouter.Request<"Error", unknown>
177+
| HttpRouter.Request<"GlobalError", unknown>
178+
| HttpRouter.Request<"Requires", unknown>
179+
| HttpRouter.Request<"GlobalRequires", never>
180+
181+
export function createRoutes(
182+
corsOptions?: CorsOptions,
183+
): Layer.Layer<never, EffectConfig.ConfigError, RouteRequirements> {
184184
return Layer.mergeAll(rootApiRoutes, eventApiRoutes, instanceRoutes, docRoute, uiRoute).pipe(
185185
Layer.provide([
186186
errorLayer,
187187
compressionLayer,
188188
corsVaryFix,
189189
fenceLayer,
190190
cors(corsOptions),
191-
runtime,
192191
Account.defaultLayer,
193192
Agent.defaultLayer,
194193
Auth.defaultLayer,
@@ -233,28 +232,20 @@ export function createRoutes(corsOptions?: CorsOptions) {
233232
FetchHttpClient.layer,
234233
HttpServer.layerServices,
235234
]),
236-
Layer.provideMerge(Layer.succeed(CorsConfig)(corsOptions)),
237-
Layer.provideMerge(InstanceLayer.layer),
238-
Layer.provideMerge(Observability.layer),
235+
Layer.provide(Layer.succeed(CorsConfig)(corsOptions)),
236+
Layer.provide(InstanceLayer.layer),
237+
Layer.provide(Observability.layer),
239238
)
240239
}
241240

242241
export const routes = createRoutes()
243242

244-
const defaultWebHandler = lazy(() =>
243+
export const webHandler = lazy(() =>
245244
HttpRouter.toWebHandler(routes, {
245+
disableLogger: true,
246246
memoMap,
247247
middleware: disposeMiddleware,
248248
}),
249249
)
250250

251-
export function webHandler(corsOptions?: CorsOptions) {
252-
if (!corsOptions?.cors?.length) return defaultWebHandler()
253-
return HttpRouter.toWebHandler(createRoutes(corsOptions), {
254-
// Server-level CORS options are dynamic; don't reuse the default route layer memoized without them.
255-
memoMap: Layer.makeMemoMapUnsafe(),
256-
middleware: disposeMiddleware,
257-
})
258-
}
259-
260-
export * as ExperimentalHttpApiServer from "./server"
251+
export * as HttpApiApp from "./server"

0 commit comments

Comments
 (0)