|
1 | | -import { Context, Effect, Layer } from "effect" |
| 1 | +import { Config as EffectConfig, Context, Effect, Layer } from "effect" |
2 | 2 | import { HttpApiBuilder, OpenApi } from "effect/unstable/httpapi" |
3 | 3 | import { |
4 | 4 | FetchHttpClient, |
@@ -90,15 +90,6 @@ import { schemaErrorLayer } from "./middleware/schema-error" |
90 | 90 |
|
91 | 91 | export const context = Context.makeUnsafe<unknown>(new Map()) |
92 | 92 |
|
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 | | - |
102 | 93 | const cors = (corsOptions?: CorsOptions) => |
103 | 94 | HttpRouter.middleware( |
104 | 95 | HttpMiddleware.cors({ |
@@ -180,15 +171,23 @@ const uiRoute = HttpRouter.use((router) => |
180 | 171 | }), |
181 | 172 | ).pipe(Layer.provide(authOnlyRouterLayer)) |
182 | 173 |
|
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> { |
184 | 184 | return Layer.mergeAll(rootApiRoutes, eventApiRoutes, instanceRoutes, docRoute, uiRoute).pipe( |
185 | 185 | Layer.provide([ |
186 | 186 | errorLayer, |
187 | 187 | compressionLayer, |
188 | 188 | corsVaryFix, |
189 | 189 | fenceLayer, |
190 | 190 | cors(corsOptions), |
191 | | - runtime, |
192 | 191 | Account.defaultLayer, |
193 | 192 | Agent.defaultLayer, |
194 | 193 | Auth.defaultLayer, |
@@ -233,28 +232,20 @@ export function createRoutes(corsOptions?: CorsOptions) { |
233 | 232 | FetchHttpClient.layer, |
234 | 233 | HttpServer.layerServices, |
235 | 234 | ]), |
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), |
239 | 238 | ) |
240 | 239 | } |
241 | 240 |
|
242 | 241 | export const routes = createRoutes() |
243 | 242 |
|
244 | | -const defaultWebHandler = lazy(() => |
| 243 | +export const webHandler = lazy(() => |
245 | 244 | HttpRouter.toWebHandler(routes, { |
| 245 | + disableLogger: true, |
246 | 246 | memoMap, |
247 | 247 | middleware: disposeMiddleware, |
248 | 248 | }), |
249 | 249 | ) |
250 | 250 |
|
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