@effect/platform 0.57.8 → 0.58.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/platform",
-  "version": "0.57.8",
+  "version": "0.58.1",
   "description": "Unified interfaces for common platform-specific services",
   "license": "MIT",
   "repository": {
@@ -15,8 +15,8 @@
     "path-browserify": "^1.0.1"
   },
   "peerDependencies": {
-    "@effect/schema": "^0.68.3",
-    "effect": "^3.3.5"
+    "@effect/schema": "^0.68.4",
+    "effect": "^3.4.0"
   },
   "publishConfig": {
     "provenance": true
@@ -41,6 +41,11 @@
       "import": "./dist/esm/CommandExecutor.js",
       "default": "./dist/cjs/CommandExecutor.js"
     },
+    "./Cookies": {
+      "types": "./dist/dts/Cookies.d.ts",
+      "import": "./dist/esm/Cookies.js",
+      "default": "./dist/cjs/Cookies.js"
+    },
     "./Effectify": {
       "types": "./dist/dts/Effectify.d.ts",
       "import": "./dist/esm/Effectify.js",
@@ -51,136 +56,116 @@
       "import": "./dist/esm/Error.js",
       "default": "./dist/cjs/Error.js"
     },
+    "./Etag": {
+      "types": "./dist/dts/Etag.d.ts",
+      "import": "./dist/esm/Etag.js",
+      "default": "./dist/cjs/Etag.js"
+    },
     "./FileSystem": {
       "types": "./dist/dts/FileSystem.d.ts",
       "import": "./dist/esm/FileSystem.js",
       "default": "./dist/cjs/FileSystem.js"
     },
-    "./Http/App": {
-      "types": "./dist/dts/Http/App.d.ts",
-      "import": "./dist/esm/Http/App.js",
-      "default": "./dist/cjs/Http/App.js"
-    },
-    "./Http/Body": {
-      "types": "./dist/dts/Http/Body.d.ts",
-      "import": "./dist/esm/Http/Body.js",
-      "default": "./dist/cjs/Http/Body.js"
-    },
-    "./Http/Client": {
-      "types": "./dist/dts/Http/Client.d.ts",
-      "import": "./dist/esm/Http/Client.js",
-      "default": "./dist/cjs/Http/Client.js"
-    },
-    "./Http/ClientError": {
-      "types": "./dist/dts/Http/ClientError.d.ts",
-      "import": "./dist/esm/Http/ClientError.js",
-      "default": "./dist/cjs/Http/ClientError.js"
-    },
-    "./Http/ClientRequest": {
-      "types": "./dist/dts/Http/ClientRequest.d.ts",
-      "import": "./dist/esm/Http/ClientRequest.js",
-      "default": "./dist/cjs/Http/ClientRequest.js"
-    },
-    "./Http/ClientResponse": {
-      "types": "./dist/dts/Http/ClientResponse.d.ts",
-      "import": "./dist/esm/Http/ClientResponse.js",
-      "default": "./dist/cjs/Http/ClientResponse.js"
-    },
-    "./Http/Cookies": {
-      "types": "./dist/dts/Http/Cookies.d.ts",
-      "import": "./dist/esm/Http/Cookies.js",
-      "default": "./dist/cjs/Http/Cookies.js"
-    },
-    "./Http/Etag": {
-      "types": "./dist/dts/Http/Etag.d.ts",
-      "import": "./dist/esm/Http/Etag.js",
-      "default": "./dist/cjs/Http/Etag.js"
-    },
-    "./Http/Headers": {
-      "types": "./dist/dts/Http/Headers.d.ts",
-      "import": "./dist/esm/Http/Headers.js",
-      "default": "./dist/cjs/Http/Headers.js"
-    },
-    "./Http/IncomingMessage": {
-      "types": "./dist/dts/Http/IncomingMessage.d.ts",
-      "import": "./dist/esm/Http/IncomingMessage.js",
-      "default": "./dist/cjs/Http/IncomingMessage.js"
-    },
-    "./Http/Method": {
-      "types": "./dist/dts/Http/Method.d.ts",
-      "import": "./dist/esm/Http/Method.js",
-      "default": "./dist/cjs/Http/Method.js"
-    },
-    "./Http/Middleware": {
-      "types": "./dist/dts/Http/Middleware.d.ts",
-      "import": "./dist/esm/Http/Middleware.js",
-      "default": "./dist/cjs/Http/Middleware.js"
-    },
-    "./Http/Multipart": {
-      "types": "./dist/dts/Http/Multipart.d.ts",
-      "import": "./dist/esm/Http/Multipart.js",
-      "default": "./dist/cjs/Http/Multipart.js"
-    },
-    "./Http/Multiplex": {
-      "types": "./dist/dts/Http/Multiplex.d.ts",
-      "import": "./dist/esm/Http/Multiplex.js",
-      "default": "./dist/cjs/Http/Multiplex.js"
-    },
-    "./Http/Platform": {
-      "types": "./dist/dts/Http/Platform.d.ts",
-      "import": "./dist/esm/Http/Platform.js",
-      "default": "./dist/cjs/Http/Platform.js"
-    },
-    "./Http/Router": {
-      "types": "./dist/dts/Http/Router.d.ts",
-      "import": "./dist/esm/Http/Router.js",
-      "default": "./dist/cjs/Http/Router.js"
-    },
-    "./Http/Server": {
-      "types": "./dist/dts/Http/Server.d.ts",
-      "import": "./dist/esm/Http/Server.js",
-      "default": "./dist/cjs/Http/Server.js"
-    },
-    "./Http/ServerError": {
-      "types": "./dist/dts/Http/ServerError.d.ts",
-      "import": "./dist/esm/Http/ServerError.js",
-      "default": "./dist/cjs/Http/ServerError.js"
-    },
-    "./Http/ServerRequest": {
-      "types": "./dist/dts/Http/ServerRequest.d.ts",
-      "import": "./dist/esm/Http/ServerRequest.js",
-      "default": "./dist/cjs/Http/ServerRequest.js"
-    },
-    "./Http/ServerResponse": {
-      "types": "./dist/dts/Http/ServerResponse.d.ts",
-      "import": "./dist/esm/Http/ServerResponse.js",
-      "default": "./dist/cjs/Http/ServerResponse.js"
-    },
-    "./Http/TraceContext": {
-      "types": "./dist/dts/Http/TraceContext.d.ts",
-      "import": "./dist/esm/Http/TraceContext.js",
-      "default": "./dist/cjs/Http/TraceContext.js"
-    },
-    "./Http/UrlParams": {
-      "types": "./dist/dts/Http/UrlParams.d.ts",
-      "import": "./dist/esm/Http/UrlParams.js",
-      "default": "./dist/cjs/Http/UrlParams.js"
+    "./Headers": {
+      "types": "./dist/dts/Headers.d.ts",
+      "import": "./dist/esm/Headers.js",
+      "default": "./dist/cjs/Headers.js"
+    },
+    "./HttpApp": {
+      "types": "./dist/dts/HttpApp.d.ts",
+      "import": "./dist/esm/HttpApp.js",
+      "default": "./dist/cjs/HttpApp.js"
+    },
+    "./HttpBody": {
+      "types": "./dist/dts/HttpBody.d.ts",
+      "import": "./dist/esm/HttpBody.js",
+      "default": "./dist/cjs/HttpBody.js"
     },
     "./HttpClient": {
       "types": "./dist/dts/HttpClient.d.ts",
       "import": "./dist/esm/HttpClient.js",
       "default": "./dist/cjs/HttpClient.js"
     },
+    "./HttpClientError": {
+      "types": "./dist/dts/HttpClientError.d.ts",
+      "import": "./dist/esm/HttpClientError.js",
+      "default": "./dist/cjs/HttpClientError.js"
+    },
+    "./HttpClientRequest": {
+      "types": "./dist/dts/HttpClientRequest.d.ts",
+      "import": "./dist/esm/HttpClientRequest.js",
+      "default": "./dist/cjs/HttpClientRequest.js"
+    },
+    "./HttpClientResponse": {
+      "types": "./dist/dts/HttpClientResponse.d.ts",
+      "import": "./dist/esm/HttpClientResponse.js",
+      "default": "./dist/cjs/HttpClientResponse.js"
+    },
+    "./HttpIncomingMessage": {
+      "types": "./dist/dts/HttpIncomingMessage.d.ts",
+      "import": "./dist/esm/HttpIncomingMessage.js",
+      "default": "./dist/cjs/HttpIncomingMessage.js"
+    },
+    "./HttpMethod": {
+      "types": "./dist/dts/HttpMethod.d.ts",
+      "import": "./dist/esm/HttpMethod.js",
+      "default": "./dist/cjs/HttpMethod.js"
+    },
+    "./HttpMiddleware": {
+      "types": "./dist/dts/HttpMiddleware.d.ts",
+      "import": "./dist/esm/HttpMiddleware.js",
+      "default": "./dist/cjs/HttpMiddleware.js"
+    },
+    "./HttpMultiplex": {
+      "types": "./dist/dts/HttpMultiplex.d.ts",
+      "import": "./dist/esm/HttpMultiplex.js",
+      "default": "./dist/cjs/HttpMultiplex.js"
+    },
+    "./HttpPlatform": {
+      "types": "./dist/dts/HttpPlatform.d.ts",
+      "import": "./dist/esm/HttpPlatform.js",
+      "default": "./dist/cjs/HttpPlatform.js"
+    },
+    "./HttpRouter": {
+      "types": "./dist/dts/HttpRouter.d.ts",
+      "import": "./dist/esm/HttpRouter.js",
+      "default": "./dist/cjs/HttpRouter.js"
+    },
     "./HttpServer": {
       "types": "./dist/dts/HttpServer.d.ts",
       "import": "./dist/esm/HttpServer.js",
       "default": "./dist/cjs/HttpServer.js"
     },
+    "./HttpServerError": {
+      "types": "./dist/dts/HttpServerError.d.ts",
+      "import": "./dist/esm/HttpServerError.js",
+      "default": "./dist/cjs/HttpServerError.js"
+    },
+    "./HttpServerRequest": {
+      "types": "./dist/dts/HttpServerRequest.d.ts",
+      "import": "./dist/esm/HttpServerRequest.js",
+      "default": "./dist/cjs/HttpServerRequest.js"
+    },
+    "./HttpServerResponse": {
+      "types": "./dist/dts/HttpServerResponse.d.ts",
+      "import": "./dist/esm/HttpServerResponse.js",
+      "default": "./dist/cjs/HttpServerResponse.js"
+    },
+    "./HttpTraceContext": {
+      "types": "./dist/dts/HttpTraceContext.d.ts",
+      "import": "./dist/esm/HttpTraceContext.js",
+      "default": "./dist/cjs/HttpTraceContext.js"
+    },
     "./KeyValueStore": {
       "types": "./dist/dts/KeyValueStore.d.ts",
       "import": "./dist/esm/KeyValueStore.js",
       "default": "./dist/cjs/KeyValueStore.js"
     },
+    "./Multipart": {
+      "types": "./dist/dts/Multipart.d.ts",
+      "import": "./dist/esm/Multipart.js",
+      "default": "./dist/cjs/Multipart.js"
+    },
     "./Path": {
       "types": "./dist/dts/Path.d.ts",
       "import": "./dist/esm/Path.js",
@@ -221,6 +206,11 @@
       "import": "./dist/esm/Transferable.js",
       "default": "./dist/cjs/Transferable.js"
     },
+    "./UrlParams": {
+      "types": "./dist/dts/UrlParams.d.ts",
+      "import": "./dist/esm/UrlParams.js",
+      "default": "./dist/cjs/UrlParams.js"
+    },
     "./Worker": {
       "types": "./dist/dts/Worker.d.ts",
       "import": "./dist/esm/Worker.js",
@@ -245,90 +235,81 @@
       "CommandExecutor": [
         "./dist/dts/CommandExecutor.d.ts"
       ],
+      "Cookies": [
+        "./dist/dts/Cookies.d.ts"
+      ],
       "Effectify": [
         "./dist/dts/Effectify.d.ts"
       ],
       "Error": [
         "./dist/dts/Error.d.ts"
       ],
+      "Etag": [
+        "./dist/dts/Etag.d.ts"
+      ],
       "FileSystem": [
         "./dist/dts/FileSystem.d.ts"
       ],
-      "Http/App": [
-        "./dist/dts/Http/App.d.ts"
-      ],
-      "Http/Body": [
-        "./dist/dts/Http/Body.d.ts"
-      ],
-      "Http/Client": [
-        "./dist/dts/Http/Client.d.ts"
+      "Headers": [
+        "./dist/dts/Headers.d.ts"
       ],
-      "Http/ClientError": [
-        "./dist/dts/Http/ClientError.d.ts"
+      "HttpApp": [
+        "./dist/dts/HttpApp.d.ts"
       ],
-      "Http/ClientRequest": [
-        "./dist/dts/Http/ClientRequest.d.ts"
+      "HttpBody": [
+        "./dist/dts/HttpBody.d.ts"
       ],
-      "Http/ClientResponse": [
-        "./dist/dts/Http/ClientResponse.d.ts"
-      ],
-      "Http/Cookies": [
-        "./dist/dts/Http/Cookies.d.ts"
-      ],
-      "Http/Etag": [
-        "./dist/dts/Http/Etag.d.ts"
-      ],
-      "Http/Headers": [
-        "./dist/dts/Http/Headers.d.ts"
-      ],
-      "Http/IncomingMessage": [
-        "./dist/dts/Http/IncomingMessage.d.ts"
+      "HttpClient": [
+        "./dist/dts/HttpClient.d.ts"
       ],
-      "Http/Method": [
-        "./dist/dts/Http/Method.d.ts"
+      "HttpClientError": [
+        "./dist/dts/HttpClientError.d.ts"
       ],
-      "Http/Middleware": [
-        "./dist/dts/Http/Middleware.d.ts"
+      "HttpClientRequest": [
+        "./dist/dts/HttpClientRequest.d.ts"
       ],
-      "Http/Multipart": [
-        "./dist/dts/Http/Multipart.d.ts"
+      "HttpClientResponse": [
+        "./dist/dts/HttpClientResponse.d.ts"
       ],
-      "Http/Multiplex": [
-        "./dist/dts/Http/Multiplex.d.ts"
+      "HttpIncomingMessage": [
+        "./dist/dts/HttpIncomingMessage.d.ts"
       ],
-      "Http/Platform": [
-        "./dist/dts/Http/Platform.d.ts"
+      "HttpMethod": [
+        "./dist/dts/HttpMethod.d.ts"
       ],
-      "Http/Router": [
-        "./dist/dts/Http/Router.d.ts"
+      "HttpMiddleware": [
+        "./dist/dts/HttpMiddleware.d.ts"
       ],
-      "Http/Server": [
-        "./dist/dts/Http/Server.d.ts"
+      "HttpMultiplex": [
+        "./dist/dts/HttpMultiplex.d.ts"
       ],
-      "Http/ServerError": [
-        "./dist/dts/Http/ServerError.d.ts"
+      "HttpPlatform": [
+        "./dist/dts/HttpPlatform.d.ts"
       ],
-      "Http/ServerRequest": [
-        "./dist/dts/Http/ServerRequest.d.ts"
+      "HttpRouter": [
+        "./dist/dts/HttpRouter.d.ts"
       ],
-      "Http/ServerResponse": [
-        "./dist/dts/Http/ServerResponse.d.ts"
+      "HttpServer": [
+        "./dist/dts/HttpServer.d.ts"
       ],
-      "Http/TraceContext": [
-        "./dist/dts/Http/TraceContext.d.ts"
+      "HttpServerError": [
+        "./dist/dts/HttpServerError.d.ts"
       ],
-      "Http/UrlParams": [
-        "./dist/dts/Http/UrlParams.d.ts"
+      "HttpServerRequest": [
+        "./dist/dts/HttpServerRequest.d.ts"
       ],
-      "HttpClient": [
-        "./dist/dts/HttpClient.d.ts"
+      "HttpServerResponse": [
+        "./dist/dts/HttpServerResponse.d.ts"
       ],
-      "HttpServer": [
-        "./dist/dts/HttpServer.d.ts"
+      "HttpTraceContext": [
+        "./dist/dts/HttpTraceContext.d.ts"
       ],
       "KeyValueStore": [
         "./dist/dts/KeyValueStore.d.ts"
       ],
+      "Multipart": [
+        "./dist/dts/Multipart.d.ts"
+      ],
       "Path": [
         "./dist/dts/Path.d.ts"
       ],
@@ -353,6 +334,9 @@
       "Transferable": [
         "./dist/dts/Transferable.d.ts"
       ],
+      "UrlParams": [
+        "./dist/dts/UrlParams.d.ts"
+      ],
       "Worker": [
         "./dist/dts/Worker.d.ts"
       ],

package/src/{Http/Cookies.ts → Cookies.ts}

@@ -10,13 +10,13 @@ import { type Pipeable, pipeArguments } from "effect/Pipeable"
 import * as Predicate from "effect/Predicate"
 import * as Record from "effect/Record"
 import type * as Types from "effect/Types"
-import { TypeIdError } from "../Error.js"
+import { TypeIdError } from "./Error.js"
 
 /**
  * @since 1.0.0
  * @category type ids
  */
-export const TypeId: unique symbol = Symbol.for("@effect/platform/Http/Cookies")
+export const TypeId: unique symbol = Symbol.for("@effect/platform/Cookies")
 
 /**
  * @since 1.0.0
@@ -43,7 +43,7 @@ export interface Cookies extends Pipeable, Inspectable.Inspectable {
  * @since 1.0.0
  * @category type ids
  */
-export const CookieTypeId: unique symbol = Symbol.for("@effect/platform/Http/Cookies/Cookie")
+export const CookieTypeId: unique symbol = Symbol.for("@effect/platform/Cookies/Cookie")
 
 /**
  * @since 1.0.0
@@ -77,7 +77,7 @@ export interface Cookie extends Inspectable.Inspectable {
  * @since 1.0.0
  * @category type ids
  */
-export const ErrorTypeId: unique symbol = Symbol.for("@effect/platform/Http/Cookies/CookieError")
+export const ErrorTypeId: unique symbol = Symbol.for("@effect/platform/Cookies/CookieError")
 
 /**
  * @since 1.0.0
@@ -102,7 +102,7 @@ const Proto: Omit<Cookies, "cookies"> = {
   ...Inspectable.BaseProto,
   toJSON(this: Cookies) {
     return {
-      _id: "@effect/platform/Http/Cookies",
+      _id: "@effect/platform/Cookies",
       cookies: Record.map(this.cookies, (cookie) => cookie.toJSON())
     }
   },
@@ -309,7 +309,7 @@ const CookieProto = {
   ...Inspectable.BaseProto,
   toJSON(this: Cookie) {
     return {
-      _id: "@effect/platform/Http/Cookies/Cookie",
+      _id: "@effect/platform/Cookies/Cookie",
       name: this.name,
       value: this.value,
       options: this.options

package/src/{Http/Etag.ts → Etag.ts}

@@ -3,9 +3,9 @@
  */
 import type * as Context from "effect/Context"
 import type * as Effect from "effect/Effect"
-import type * as FileSystem from "../FileSystem.js"
-import * as internal from "../internal/http/etag.js"
-import type * as Body from "./Body.js"
+import type * as FileSystem from "./FileSystem.js"
+import type * as Body from "./HttpBody.js"
+import * as internal from "./internal/etag.js"
 
 /**
  * @since 1.0.0
@@ -56,7 +56,7 @@ export type GeneratorTypeId = typeof GeneratorTypeId
 export interface Generator {
   readonly [GeneratorTypeId]: GeneratorTypeId
   readonly fromFileInfo: (info: FileSystem.File.Info) => Effect.Effect<Etag>
-  readonly fromFileWeb: (file: Body.Body.FileLike) => Effect.Effect<Etag>
+  readonly fromFileWeb: (file: Body.HttpBody.FileLike) => Effect.Effect<Etag>
 }
 
 /**

package/src/{Http/Headers.ts → Headers.ts}

@@ -16,7 +16,7 @@ import type { Mutable } from "effect/Types"
  * @since 1.0.0
  * @category type ids
  */
-export const HeadersTypeId: unique symbol = Symbol.for("@effect/platform/Http/Headers")
+export const HeadersTypeId: unique symbol = Symbol.for("@effect/platform/Headers")
 
 /**
  * @since 1.0.0
@@ -249,7 +249,7 @@ export const redact: {
  * @category fiber refs
  */
 export const currentRedactedNames = globalValue(
-  "@effect/platform/Http/Headers/currentRedactedNames",
+  "@effect/platform/Headers/currentRedactedNames",
   () =>
     FiberRef.unsafeMake<ReadonlyArray<string | RegExp>>([
       "authorization",

package/src/{Http/App.ts → HttpApp.ts}

@@ -12,25 +12,25 @@ import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Runtime from "effect/Runtime"
 import * as Scope from "effect/Scope"
-import * as internalMiddleware from "../internal/http/middleware.js"
-import type { Middleware } from "./Middleware.js"
-import * as ServerError from "./ServerError.js"
-import * as ServerRequest from "./ServerRequest.js"
-import * as ServerResponse from "./ServerResponse.js"
+import type { HttpMiddleware } from "./HttpMiddleware.js"
+import * as ServerError from "./HttpServerError.js"
+import * as ServerRequest from "./HttpServerRequest.js"
+import * as ServerResponse from "./HttpServerResponse.js"
+import * as internalMiddleware from "./internal/httpMiddleware.js"
 
 /**
  * @since 1.0.0
  * @category models
  */
-export interface HttpApp<A = ServerResponse.ServerResponse, E = never, R = never>
-  extends Effect.Effect<A, E, R | ServerRequest.ServerRequest>
+export interface HttpApp<A = ServerResponse.HttpServerResponse, E = never, R = never>
+  extends Effect.Effect<A, E, R | ServerRequest.HttpServerRequest>
 {}
 
 /**
  * @since 1.0.0
  * @category models
  */
-export type Default<E = never, R = never> = HttpApp<ServerResponse.ServerResponse, E, R>
+export type Default<E = never, R = never> = HttpApp<ServerResponse.HttpServerResponse, E, R>
 
 /**
  * @since 1.0.0
@@ -39,17 +39,17 @@ export type Default<E = never, R = never> = HttpApp<ServerResponse.ServerRespons
 export const toHandled = <E, R, _, RH>(
   self: Default<E, R>,
   handleResponse: (
-    request: ServerRequest.ServerRequest,
-    exit: Exit.Exit<ServerResponse.ServerResponse, E | ServerError.ResponseError>
+    request: ServerRequest.HttpServerRequest,
+    exit: Exit.Exit<ServerResponse.HttpServerResponse, E | ServerError.ResponseError>
   ) => Effect.Effect<_, never, RH>,
-  middleware?: Middleware | undefined
+  middleware?: HttpMiddleware | undefined
 ): Default<E | ServerError.ResponseError, Exclude<R | RH, Scope.Scope>> => {
   const responded = Effect.withFiberRuntime<
-    ServerResponse.ServerResponse,
+    ServerResponse.HttpServerResponse,
     E | ServerError.ResponseError,
-    R | RH | ServerRequest.ServerRequest
+    R | RH | ServerRequest.HttpServerRequest
   >((fiber) => {
-    const request = Context.unsafeGet(fiber.getFiberRef(FiberRef.currentContext), ServerRequest.ServerRequest)
+    const request = Context.unsafeGet(fiber.getFiberRef(FiberRef.currentContext), ServerRequest.HttpServerRequest)
     const preHandled = Effect.flatMap(self, (response) => {
       const handler = fiber.getFiberRef(currentPreResponseHandlers)
       return handler._tag === "Some" ? handler.value(request, response) : Effect.succeed(response)
@@ -76,16 +76,16 @@ export const toHandled = <E, R, _, RH>(
  * @category models
  */
 export type PreResponseHandler = (
-  request: ServerRequest.ServerRequest,
-  response: ServerResponse.ServerResponse
-) => Effect.Effect<ServerResponse.ServerResponse, ServerError.ResponseError>
+  request: ServerRequest.HttpServerRequest,
+  response: ServerResponse.HttpServerResponse
+) => Effect.Effect<ServerResponse.HttpServerResponse, ServerError.ResponseError>
 
 /**
  * @since 1.0.0
  * @category fiber refs
  */
 export const currentPreResponseHandlers: FiberRef.FiberRef<Option.Option<PreResponseHandler>> = globalValue(
-  Symbol.for("@effect/platform/Http/App/preResponseHandlers"),
+  Symbol.for("@effect/platform/HttpApp/preResponseHandlers"),
   () => FiberRef.unsafeMake<Option.Option<PreResponseHandler>>(Option.none())
 )
 
@@ -152,7 +152,7 @@ export const toWebHandlerRuntime = <R>(runtime: Runtime.Runtime<R>) => {
         const req = ServerRequest.fromWeb(request)
         ;(req as any)[resolveSymbol] = resolve
         ;(req as any)[rejectSymbol] = reject
-        const fiber = run(Effect.provideService(handled, ServerRequest.ServerRequest, req))
+        const fiber = run(Effect.provideService(handled, ServerRequest.HttpServerRequest, req))
         request.signal.addEventListener("abort", () => {
           fiber.unsafeInterruptAsFork(ServerError.clientAbortFiberId)
         }, { once: true })