@effect/platform 0.57.8 → 0.58.0

package/src/internal/{http/server.ts → httpServer.ts}

@@ -3,71 +3,71 @@ import * as Effect from "effect/Effect"
 import { dual } from "effect/Function"
 import * as Layer from "effect/Layer"
 import type * as Scope from "effect/Scope"
-import type * as App from "../../Http/App.js"
-import type * as Middleware from "../../Http/Middleware.js"
-import type * as Server from "../../Http/Server.js"
-import type * as ServerRequest from "../../Http/ServerRequest.js"
+import type * as App from "../HttpApp.js"
+import type * as Middleware from "../HttpMiddleware.js"
+import type * as Server from "../HttpServer.js"
+import type * as ServerRequest from "../HttpServerRequest.js"
 
 /** @internal */
-export const TypeId: Server.TypeId = Symbol.for("@effect/platform/Http/Server") as Server.TypeId
+export const TypeId: Server.TypeId = Symbol.for("@effect/platform/HttpServer") as Server.TypeId
 
 /** @internal */
-export const serverTag = Context.GenericTag<Server.Server>("@effect/platform/Http/Server")
+export const serverTag = Context.GenericTag<Server.HttpServer>("@effect/platform/HttpServer")
 
 const serverProto = {
   [TypeId]: TypeId
 }
 
 /** @internal */
-export const isServer = (u: unknown): u is Server.Server => typeof u === "object" && u !== null && TypeId in u
+export const isServer = (u: unknown): u is Server.HttpServer => typeof u === "object" && u !== null && TypeId in u
 
 /** @internal */
 export const make = (
   options: {
     readonly serve: (
       httpApp: App.Default<unknown>,
-      middleware?: Middleware.Middleware
+      middleware?: Middleware.HttpMiddleware
     ) => Effect.Effect<void, never, Scope.Scope>
     readonly address: Server.Address
   }
-): Server.Server => Object.assign(Object.create(serverProto), options)
+): Server.HttpServer => Object.assign(Object.create(serverProto), options)
 
 /** @internal */
 export const serve = dual<
   {
     (): <E, R>(
       httpApp: App.Default<E, R>
-    ) => Layer.Layer<never, never, Server.Server | Exclude<R, ServerRequest.ServerRequest | Scope.Scope>>
-    <E, R, App extends App.Default<any, any>>(middleware: Middleware.Middleware.Applied<App, E, R>): (
+    ) => Layer.Layer<never, never, Server.HttpServer | Exclude<R, ServerRequest.HttpServerRequest | Scope.Scope>>
+    <E, R, App extends App.Default<any, any>>(middleware: Middleware.HttpMiddleware.Applied<App, E, R>): (
       httpApp: App.Default<E, R>
     ) => Layer.Layer<
       never,
       never,
-      Server.Server | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest | Scope.Scope>
+      Server.HttpServer | Exclude<Effect.Effect.Context<App>, ServerRequest.HttpServerRequest | Scope.Scope>
     >
   },
   {
     <E, R>(
       httpApp: App.Default<E, R>
-    ): Layer.Layer<never, never, Server.Server | Exclude<R, ServerRequest.ServerRequest | Scope.Scope>>
+    ): Layer.Layer<never, never, Server.HttpServer | Exclude<R, ServerRequest.HttpServerRequest | Scope.Scope>>
     <E, R, App extends App.Default<any, any>>(
       httpApp: App.Default<E, R>,
-      middleware: Middleware.Middleware.Applied<App, E, R>
+      middleware: Middleware.HttpMiddleware.Applied<App, E, R>
     ): Layer.Layer<
       never,
       never,
-      Server.Server | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest | Scope.Scope>
+      Server.HttpServer | Exclude<Effect.Effect.Context<App>, ServerRequest.HttpServerRequest | Scope.Scope>
     >
   }
 >(
   (args) => Effect.isEffect(args[0]),
   <E, R, App extends App.Default<any, any>>(
     httpApp: App.Default<E, R>,
-    middleware?: Middleware.Middleware.Applied<App, E, R>
+    middleware?: Middleware.HttpMiddleware.Applied<App, E, R>
   ): Layer.Layer<
     never,
     never,
-    Server.Server | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest | Scope.Scope>
+    Server.HttpServer | Exclude<Effect.Effect.Context<App>, ServerRequest.HttpServerRequest | Scope.Scope>
   > =>
     Layer.scopedDiscard(
       Effect.flatMap(
@@ -85,38 +85,38 @@ export const serveEffect = dual<
     ) => Effect.Effect<
       void,
       never,
-      Server.Server | Scope.Scope | Exclude<R, ServerRequest.ServerRequest>
+      Server.HttpServer | Scope.Scope | Exclude<R, ServerRequest.HttpServerRequest>
     >
-    <E, R, App extends App.Default<any, any>>(middleware: Middleware.Middleware.Applied<App, E, R>): (
+    <E, R, App extends App.Default<any, any>>(middleware: Middleware.HttpMiddleware.Applied<App, E, R>): (
       httpApp: App.Default<E, R>
     ) => Effect.Effect<
       void,
       never,
-      Server.Server | Scope.Scope | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest>
+      Server.HttpServer | Scope.Scope | Exclude<Effect.Effect.Context<App>, ServerRequest.HttpServerRequest>
     >
   },
   {
     <E, R>(
       httpApp: App.Default<E, R>
-    ): Effect.Effect<void, never, Server.Server | Scope.Scope | Exclude<R, ServerRequest.ServerRequest>>
+    ): Effect.Effect<void, never, Server.HttpServer | Scope.Scope | Exclude<R, ServerRequest.HttpServerRequest>>
     <E, R, App extends App.Default<any, any>>(
       httpApp: App.Default<E, R>,
-      middleware: Middleware.Middleware.Applied<App, E, R>
+      middleware: Middleware.HttpMiddleware.Applied<App, E, R>
     ): Effect.Effect<
       void,
       never,
-      Server.Server | Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest> | Scope.Scope
+      Server.HttpServer | Exclude<Effect.Effect.Context<App>, ServerRequest.HttpServerRequest> | Scope.Scope
     >
   }
 >(
   (args) => Effect.isEffect(args[0]),
   (<E, R, App extends App.Default<any, any>>(
     httpApp: App.Default<E, R>,
-    middleware: Middleware.Middleware.Applied<App, E, R>
+    middleware: Middleware.HttpMiddleware.Applied<App, E, R>
   ): Effect.Effect<
     void,
     never,
-    Server.Server | Exclude<R, ServerRequest.ServerRequest> | Scope.Scope
+    Server.HttpServer | Exclude<R, ServerRequest.HttpServerRequest> | Scope.Scope
   > =>
     Effect.flatMap(
       serverTag,
@@ -137,7 +137,7 @@ export const formatAddress = (address: Server.Address): string => {
 /** @internal */
 export const addressWith = <A, E, R>(
   effect: (address: Server.Address) => Effect.Effect<A, E, R>
-): Effect.Effect<A, E, Server.Server | R> =>
+): Effect.Effect<A, E, Server.HttpServer | R> =>
   Effect.flatMap(
     serverTag,
     (server) => effect(server.address)
@@ -146,21 +146,21 @@ export const addressWith = <A, E, R>(
 /** @internal */
 export const addressFormattedWith = <A, E, R>(
   effect: (address: string) => Effect.Effect<A, E, R>
-): Effect.Effect<A, E, Server.Server | R> =>
+): Effect.Effect<A, E, Server.HttpServer | R> =>
   Effect.flatMap(
     serverTag,
     (server) => effect(formatAddress(server.address))
   )
 
 /** @internal */
-export const logAddress: Effect.Effect<void, never, Server.Server> = addressFormattedWith((_) =>
+export const logAddress: Effect.Effect<void, never, Server.HttpServer> = addressFormattedWith((_) =>
   Effect.log(`Listening on ${_}`)
 )
 
 /** @internal */
 export const withLogAddress = <A, E, R>(
   layer: Layer.Layer<A, E, R>
-): Layer.Layer<A, E, R | Exclude<Server.Server, A>> =>
+): Layer.Layer<A, E, R | Exclude<Server.HttpServer, A>> =>
   Layer.effectDiscard(logAddress).pipe(
     Layer.provideMerge(layer)
   )

package/src/internal/{http/serverError.ts → httpServerError.ts}

@@ -3,11 +3,11 @@ import * as FiberId from "effect/FiberId"
 import { globalValue } from "effect/GlobalValue"
 import * as Option from "effect/Option"
 import * as Predicate from "effect/Predicate"
-import type * as Error from "../../Http/ServerError.js"
+import type * as Error from "../HttpServerError.js"
 
 /** @internal */
 export const TypeId: Error.TypeId = Symbol.for(
-  "@effect/platform/Http/Error"
+  "@effect/platform/HttpServerError"
 ) as Error.TypeId
 
 /** @internal */
@@ -15,7 +15,7 @@ export const isServerError = (u: unknown): u is Error.HttpServerError => Predica
 
 /** @internal */
 export const clientAbortFiberId = globalValue(
-  "@effect/platform/Http/ServerError/clientAbortFiberId",
+  "@effect/platform/HttpServerError/clientAbortFiberId",
   () => FiberId.runtime(-499, 0)
 )
 

package/src/internal/{http/serverRequest.ts → httpServerRequest.ts}

@@ -9,29 +9,31 @@ import * as Option from "effect/Option"
 import type { ReadonlyRecord } from "effect/Record"
 import type * as Scope from "effect/Scope"
 import * as Stream from "effect/Stream"
-import type * as FileSystem from "../../FileSystem.js"
-import * as Cookies from "../../Http/Cookies.js"
-import * as Headers from "../../Http/Headers.js"
-import * as IncomingMessage from "../../Http/IncomingMessage.js"
-import type { Method } from "../../Http/Method.js"
-import * as Multipart from "../../Http/Multipart.js"
-import * as Error from "../../Http/ServerError.js"
-import type * as ServerRequest from "../../Http/ServerRequest.js"
-import * as UrlParams from "../../Http/UrlParams.js"
-import type * as Path from "../../Path.js"
-import * as Socket from "../../Socket.js"
+import * as Cookies from "../Cookies.js"
+import type * as FileSystem from "../FileSystem.js"
+import * as Headers from "../Headers.js"
+import * as IncomingMessage from "../HttpIncomingMessage.js"
+import type { HttpMethod } from "../HttpMethod.js"
+import * as Error from "../HttpServerError.js"
+import type * as ServerRequest from "../HttpServerRequest.js"
+import * as Multipart from "../Multipart.js"
+import type * as Path from "../Path.js"
+import * as Socket from "../Socket.js"
+import * as UrlParams from "../UrlParams.js"
 
 /** @internal */
-export const TypeId: ServerRequest.TypeId = Symbol.for("@effect/platform/Http/ServerRequest") as ServerRequest.TypeId
+export const TypeId: ServerRequest.TypeId = Symbol.for("@effect/platform/HttpServerRequest") as ServerRequest.TypeId
 
 /** @internal */
-export const serverRequestTag = Context.GenericTag<ServerRequest.ServerRequest>("@effect/platform/Http/ServerRequest")
+export const serverRequestTag = Context.GenericTag<ServerRequest.HttpServerRequest>(
+  "@effect/platform/HttpServerRequest"
+)
 
 /** @internal */
 export const parsedSearchParamsTag = Context.GenericTag<
   ServerRequest.ParsedSearchParams,
   ReadonlyRecord<string, string | Array<string>>
->("@effect/platform/Http/ServerRequest/ParsedSearchParams")
+>("@effect/platform/HttpServerRequest/ParsedSearchParams")
 
 /** @internal */
 export const upgrade = Effect.flatMap(serverRequestTag, (request) => request.upgrade)
@@ -93,7 +95,7 @@ export const schemaBodyJson = <A, I, R>(schema: Schema.Schema<A, I, R>, options?
   return Effect.flatMap(serverRequestTag, parse)
 }
 
-const isMultipart = (request: ServerRequest.ServerRequest) =>
+const isMultipart = (request: ServerRequest.HttpServerRequest) =>
   request.headers["content-type"]?.toLowerCase().includes("multipart/form-data")
 
 /** @internal */
@@ -106,7 +108,7 @@ export const schemaBodyForm = <A, I extends Partial<Multipart.Persisted>, R>(
   return Effect.flatMap(serverRequestTag, (request): Effect.Effect<
     A,
     Multipart.MultipartError | ParseResult.ParseError | Error.RequestError,
-    R | ServerRequest.ServerRequest | Scope.Scope | FileSystem.FileSystem | Path.Path
+    R | ServerRequest.HttpServerRequest | Scope.Scope | FileSystem.FileSystem | Path.Path
   > => {
     if (isMultipart(request)) {
       return Effect.flatMap(request.multipart, parseMultipart)
@@ -145,7 +147,7 @@ export const schemaBodyFormJson = <A, I, R>(schema: Schema.Schema<A, I, R>, opti
       ): Effect.Effect<
         A,
         ParseResult.ParseError | Error.RequestError,
-        R | FileSystem.FileSystem | Path.Path | Scope.Scope | ServerRequest.ServerRequest
+        R | FileSystem.FileSystem | Path.Path | Scope.Scope | ServerRequest.HttpServerRequest
       > => {
         if (isMultipart(request)) {
           return Effect.flatMap(
@@ -164,10 +166,10 @@ export const schemaBodyFormJson = <A, I, R>(schema: Schema.Schema<A, I, R>, opti
 }
 
 /** @internal */
-export const fromWeb = (request: globalThis.Request): ServerRequest.ServerRequest =>
+export const fromWeb = (request: globalThis.Request): ServerRequest.HttpServerRequest =>
   new ServerRequestImpl(request, request.url)
 
-class ServerRequestImpl extends Inspectable.Class implements ServerRequest.ServerRequest {
+class ServerRequestImpl extends Inspectable.Class implements ServerRequest.HttpServerRequest {
   readonly [TypeId]: ServerRequest.TypeId
   readonly [IncomingMessage.TypeId]: IncomingMessage.TypeId
   constructor(
@@ -182,7 +184,7 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.Serve
   }
   toJSON(): unknown {
     return IncomingMessage.inspect(this, {
-      _id: "@effect/platform/Http/ServerRequest",
+      _id: "@effect/platform/HttpServerRequest",
       method: this.method,
       url: this.originalUrl
     })
@@ -201,8 +203,8 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.Serve
       options.remoteAddress ?? this.remoteAddressOverride
     )
   }
-  get method(): Method {
-    return this.source.method.toUpperCase() as Method
+  get method(): HttpMethod {
+    return this.source.method.toUpperCase() as HttpMethod
   }
   get originalUrl() {
     return this.source.url

package/src/internal/{http/serverResponse.ts → httpServerResponse.ts}

@@ -5,22 +5,22 @@ import * as Effectable from "effect/Effectable"
 import { dual } from "effect/Function"
 import * as Inspectable from "effect/Inspectable"
 import * as Stream from "effect/Stream"
-import type * as PlatformError from "../../Error.js"
-import type * as FileSystem from "../../FileSystem.js"
-import type * as Body from "../../Http/Body.js"
-import * as Cookies from "../../Http/Cookies.js"
-import * as Headers from "../../Http/Headers.js"
-import * as Platform from "../../Http/Platform.js"
-import type * as ServerResponse from "../../Http/ServerResponse.js"
-import * as UrlParams from "../../Http/UrlParams.js"
-import * as Template from "../../Template.js"
-import * as internalBody from "./body.js"
+import * as Cookies from "../Cookies.js"
+import type * as PlatformError from "../Error.js"
+import type * as FileSystem from "../FileSystem.js"
+import * as Headers from "../Headers.js"
+import type * as Body from "../HttpBody.js"
+import * as Platform from "../HttpPlatform.js"
+import type * as ServerResponse from "../HttpServerResponse.js"
+import * as Template from "../Template.js"
+import * as UrlParams from "../UrlParams.js"
+import * as internalBody from "./httpBody.js"
 
 /** @internal */
-export const TypeId: ServerResponse.TypeId = Symbol.for("@effect/platform/Http/ServerResponse") as ServerResponse.TypeId
+export const TypeId: ServerResponse.TypeId = Symbol.for("@effect/platform/HttpServerResponse") as ServerResponse.TypeId
 
-class ServerResponseImpl extends Effectable.StructuralClass<ServerResponse.ServerResponse>
-  implements ServerResponse.ServerResponse
+class ServerResponseImpl extends Effectable.StructuralClass<ServerResponse.HttpServerResponse>
+  implements ServerResponse.HttpServerResponse
 {
   readonly [TypeId]: ServerResponse.TypeId
   readonly headers: Headers.Headers
@@ -29,7 +29,7 @@ class ServerResponseImpl extends Effectable.StructuralClass<ServerResponse.Serve
     readonly statusText: string | undefined,
     headers: Headers.Headers,
     readonly cookies: Cookies.Cookies,
-    readonly body: Body.Body
+    readonly body: Body.HttpBody
   ) {
     super()
     this[TypeId] = TypeId
@@ -47,7 +47,7 @@ class ServerResponseImpl extends Effectable.StructuralClass<ServerResponse.Serve
     }
   }
 
-  commit(): Effect.Effect<ServerResponse.ServerResponse> {
+  commit(): Effect.Effect<ServerResponse.HttpServerResponse> {
     return Effect.succeed(this)
   }
 
@@ -61,7 +61,7 @@ class ServerResponseImpl extends Effectable.StructuralClass<ServerResponse.Serve
 
   toJSON() {
     return {
-      _id: "@effect/platform/Http/ServerResponse",
+      _id: "@effect/platform/HttpServerResponse",
       status: this.status,
       statusText: this.statusText,
       headers: this.headers,
@@ -72,11 +72,11 @@ class ServerResponseImpl extends Effectable.StructuralClass<ServerResponse.Serve
 }
 
 /** @internal */
-export const isServerResponse = (u: unknown): u is ServerResponse.ServerResponse =>
+export const isServerResponse = (u: unknown): u is ServerResponse.HttpServerResponse =>
   typeof u === "object" && u !== null && TypeId in u
 
 /** @internal */
-export const empty = (options?: ServerResponse.Options.WithContent | undefined): ServerResponse.ServerResponse =>
+export const empty = (options?: ServerResponse.Options.WithContent | undefined): ServerResponse.HttpServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 204,
     options?.statusText,
@@ -89,7 +89,7 @@ export const empty = (options?: ServerResponse.Options.WithContent | undefined):
 export const uint8Array = (
   body: Uint8Array,
   options?: ServerResponse.Options.WithContentType
-): ServerResponse.ServerResponse =>
+): ServerResponse.HttpServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
     options?.statusText,
@@ -99,7 +99,10 @@ export const uint8Array = (
   )
 
 /** @internal */
-export const text = (body: string, options?: ServerResponse.Options.WithContentType): ServerResponse.ServerResponse =>
+export const text = (
+  body: string,
+  options?: ServerResponse.Options.WithContentType
+): ServerResponse.HttpServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
     options?.statusText,
@@ -114,11 +117,11 @@ export const html: {
     strings: TemplateStringsArray,
     ...args: A
   ): Effect.Effect<
-    ServerResponse.ServerResponse,
+    ServerResponse.HttpServerResponse,
     Template.Interpolated.Error<A[number]>,
     Template.Interpolated.Context<A[number]>
   >
-  (html: string): ServerResponse.ServerResponse
+  (html: string): ServerResponse.HttpServerResponse
 } = (
   strings: TemplateStringsArray | string,
   ...args: ReadonlyArray<Template.Interpolated>
@@ -138,7 +141,7 @@ export const htmlStream = <A extends ReadonlyArray<Template.InterpolatedWithStre
   strings: TemplateStringsArray,
   ...args: A
 ): Effect.Effect<
-  ServerResponse.ServerResponse,
+  ServerResponse.HttpServerResponse,
   never,
   Template.Interpolated.Context<A[number]>
 > =>
@@ -158,7 +161,7 @@ export const htmlStream = <A extends ReadonlyArray<Template.InterpolatedWithStre
 export const json = (
   body: unknown,
   options?: ServerResponse.Options.WithContent | undefined
-): Effect.Effect<ServerResponse.ServerResponse, Body.BodyError> =>
+): Effect.Effect<ServerResponse.HttpServerResponse, Body.HttpBodyError> =>
   Effect.map(internalBody.json(body), (body) =>
     new ServerResponseImpl(
       options?.status ?? 200,
@@ -172,7 +175,7 @@ export const json = (
 export const unsafeJson = (
   body: unknown,
   options?: ServerResponse.Options.WithContent | undefined
-): ServerResponse.ServerResponse =>
+): ServerResponse.HttpServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
     options?.statusText,
@@ -190,7 +193,7 @@ export const schemaJson = <A, I, R>(
   return (
     body: A,
     options?: ServerResponse.Options.WithContent | undefined
-  ): Effect.Effect<ServerResponse.ServerResponse, Body.BodyError, R> =>
+  ): Effect.Effect<ServerResponse.HttpServerResponse, Body.HttpBodyError, R> =>
     Effect.map(encode(body), (body) =>
       new ServerResponseImpl(
         options?.status ?? 200,
@@ -205,19 +208,19 @@ export const schemaJson = <A, I, R>(
 export const file = (
   path: string,
   options?: (ServerResponse.Options & FileSystem.StreamOptions) | undefined
-): Effect.Effect<ServerResponse.ServerResponse, PlatformError.PlatformError, Platform.Platform> =>
+): Effect.Effect<ServerResponse.HttpServerResponse, PlatformError.PlatformError, Platform.HttpPlatform> =>
   Effect.flatMap(
-    Platform.Platform,
+    Platform.HttpPlatform,
     (platform) => platform.fileResponse(path, options)
   )
 
 /** @internal */
 export const fileWeb = (
-  file: Body.Body.FileLike,
+  file: Body.HttpBody.FileLike,
   options?: (ServerResponse.Options.WithContent & FileSystem.StreamOptions) | undefined
-): Effect.Effect<ServerResponse.ServerResponse, never, Platform.Platform> =>
+): Effect.Effect<ServerResponse.HttpServerResponse, never, Platform.HttpPlatform> =>
   Effect.flatMap(
-    Platform.Platform,
+    Platform.HttpPlatform,
     (platform) => platform.fileWebResponse(file, options)
   )
 
@@ -225,7 +228,7 @@ export const fileWeb = (
 export const urlParams = (
   body: UrlParams.Input,
   options?: ServerResponse.Options.WithContent | undefined
-): ServerResponse.ServerResponse =>
+): ServerResponse.HttpServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
     options?.statusText,
@@ -235,7 +238,7 @@ export const urlParams = (
   )
 
 /** @internal */
-export const raw = (body: unknown, options?: ServerResponse.Options | undefined): ServerResponse.ServerResponse =>
+export const raw = (body: unknown, options?: ServerResponse.Options | undefined): ServerResponse.HttpServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
     options?.statusText,
@@ -248,7 +251,7 @@ export const raw = (body: unknown, options?: ServerResponse.Options | undefined)
 export const formData = (
   body: FormData,
   options?: ServerResponse.Options.WithContent | undefined
-): ServerResponse.ServerResponse =>
+): ServerResponse.HttpServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
     options?.statusText,
@@ -261,7 +264,7 @@ export const formData = (
 export const stream = <E>(
   body: Stream.Stream<Uint8Array, E>,
   options?: ServerResponse.Options | undefined
-): ServerResponse.ServerResponse =>
+): ServerResponse.HttpServerResponse =>
   new ServerResponseImpl(
     options?.status ?? 200,
     options?.statusText,
@@ -283,8 +286,8 @@ export const getContentType = (options?: ServerResponse.Options | undefined): st
 
 /** @internal */
 export const setHeader = dual<
-  (key: string, value: string) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
-  (self: ServerResponse.ServerResponse, key: string, value: string) => ServerResponse.ServerResponse
+  (key: string, value: string) => (self: ServerResponse.HttpServerResponse) => ServerResponse.HttpServerResponse,
+  (self: ServerResponse.HttpServerResponse, key: string, value: string) => ServerResponse.HttpServerResponse
 >(3, (self, key, value) =>
   new ServerResponseImpl(
     self.status,
@@ -296,8 +299,8 @@ export const setHeader = dual<
 
 /** @internal */
 export const replaceCookies = dual<
-  (cookies: Cookies.Cookies) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
-  (self: ServerResponse.ServerResponse, cookies: Cookies.Cookies) => ServerResponse.ServerResponse
+  (cookies: Cookies.Cookies) => (self: ServerResponse.HttpServerResponse) => ServerResponse.HttpServerResponse,
+  (self: ServerResponse.HttpServerResponse, cookies: Cookies.Cookies) => ServerResponse.HttpServerResponse
 >(2, (self, cookies) =>
   new ServerResponseImpl(
     self.status,
@@ -313,13 +316,15 @@ export const setCookie = dual<
     name: string,
     value: string,
     options?: Cookies.Cookie["options"]
-  ) => (self: ServerResponse.ServerResponse) => Effect.Effect<ServerResponse.ServerResponse, Cookies.CookiesError>,
+  ) => (
+    self: ServerResponse.HttpServerResponse
+  ) => Effect.Effect<ServerResponse.HttpServerResponse, Cookies.CookiesError>,
   (
-    self: ServerResponse.ServerResponse,
+    self: ServerResponse.HttpServerResponse,
     name: string,
     value: string,
     options?: Cookies.Cookie["options"]
-  ) => Effect.Effect<ServerResponse.ServerResponse, Cookies.CookiesError>
+  ) => Effect.Effect<ServerResponse.HttpServerResponse, Cookies.CookiesError>
 >(
   (args) => isServerResponse(args[0]),
   (self, name, value, options) =>
@@ -339,13 +344,13 @@ export const unsafeSetCookie = dual<
     name: string,
     value: string,
     options?: Cookies.Cookie["options"]
-  ) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
+  ) => (self: ServerResponse.HttpServerResponse) => ServerResponse.HttpServerResponse,
   (
-    self: ServerResponse.ServerResponse,
+    self: ServerResponse.HttpServerResponse,
     name: string,
     value: string,
     options?: Cookies.Cookie["options"]
-  ) => ServerResponse.ServerResponse
+  ) => ServerResponse.HttpServerResponse
 >(
   (args) => isServerResponse(args[0]),
   (self, name, value, options) =>
@@ -362,11 +367,11 @@ export const unsafeSetCookie = dual<
 export const updateCookies = dual<
   (
     f: (cookies: Cookies.Cookies) => Cookies.Cookies
-  ) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
+  ) => (self: ServerResponse.HttpServerResponse) => ServerResponse.HttpServerResponse,
   (
-    self: ServerResponse.ServerResponse,
+    self: ServerResponse.HttpServerResponse,
     f: (cookies: Cookies.Cookies) => Cookies.Cookies
-  ) => ServerResponse.ServerResponse
+  ) => ServerResponse.HttpServerResponse
 >(2, (self, f) =>
   new ServerResponseImpl(
     self.status,
@@ -380,11 +385,13 @@ export const updateCookies = dual<
 export const setCookies = dual<
   (
     cookies: Iterable<readonly [name: string, value: string, options?: Cookies.Cookie["options"]]>
-  ) => (self: ServerResponse.ServerResponse) => Effect.Effect<ServerResponse.ServerResponse, Cookies.CookiesError>,
+  ) => (
+    self: ServerResponse.HttpServerResponse
+  ) => Effect.Effect<ServerResponse.HttpServerResponse, Cookies.CookiesError>,
   (
-    self: ServerResponse.ServerResponse,
+    self: ServerResponse.HttpServerResponse,
     cookies: Iterable<readonly [name: string, value: string, options?: Cookies.Cookie["options"]]>
-  ) => Effect.Effect<ServerResponse.ServerResponse, Cookies.CookiesError>
+  ) => Effect.Effect<ServerResponse.HttpServerResponse, Cookies.CookiesError>
 >(
   2,
   (self, cookies) =>
@@ -402,11 +409,11 @@ export const setCookies = dual<
 export const unsafeSetCookies = dual<
   (
     cookies: Iterable<readonly [name: string, value: string, options?: Cookies.Cookie["options"]]>
-  ) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
+  ) => (self: ServerResponse.HttpServerResponse) => ServerResponse.HttpServerResponse,
   (
-    self: ServerResponse.ServerResponse,
+    self: ServerResponse.HttpServerResponse,
     cookies: Iterable<readonly [name: string, value: string, options?: Cookies.Cookie["options"]]>
-  ) => ServerResponse.ServerResponse
+  ) => ServerResponse.HttpServerResponse
 >(
   2,
   (self, cookies) =>
@@ -423,11 +430,11 @@ export const unsafeSetCookies = dual<
 export const removeCookie = dual<
   (
     name: string
-  ) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
+  ) => (self: ServerResponse.HttpServerResponse) => ServerResponse.HttpServerResponse,
   (
-    self: ServerResponse.ServerResponse,
+    self: ServerResponse.HttpServerResponse,
     name: string
-  ) => ServerResponse.ServerResponse
+  ) => ServerResponse.HttpServerResponse
 >(
   2,
   (self, name) =>
@@ -442,8 +449,8 @@ export const removeCookie = dual<
 
 /** @internal */
 export const setHeaders = dual<
-  (input: Headers.Input) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
-  (self: ServerResponse.ServerResponse, input: Headers.Input) => ServerResponse.ServerResponse
+  (input: Headers.Input) => (self: ServerResponse.HttpServerResponse) => ServerResponse.HttpServerResponse,
+  (self: ServerResponse.HttpServerResponse, input: Headers.Input) => ServerResponse.HttpServerResponse
 >(2, (self, input) =>
   new ServerResponseImpl(
     self.status,
@@ -455,8 +462,11 @@ export const setHeaders = dual<
 
 /** @internal */
 export const setStatus = dual<
-  (status: number, statusText?: string) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
-  (self: ServerResponse.ServerResponse, status: number, statusText?: string) => ServerResponse.ServerResponse
+  (
+    status: number,
+    statusText?: string
+  ) => (self: ServerResponse.HttpServerResponse) => ServerResponse.HttpServerResponse,
+  (self: ServerResponse.HttpServerResponse, status: number, statusText?: string) => ServerResponse.HttpServerResponse
 >((args) => isServerResponse(args[0]), (self, status, statusText) =>
   new ServerResponseImpl(
     status,
@@ -468,8 +478,8 @@ export const setStatus = dual<
 
 /** @internal */
 export const setBody = dual<
-  (body: Body.Body) => (self: ServerResponse.ServerResponse) => ServerResponse.ServerResponse,
-  (self: ServerResponse.ServerResponse, body: Body.Body) => ServerResponse.ServerResponse
+  (body: Body.HttpBody) => (self: ServerResponse.HttpServerResponse) => ServerResponse.HttpServerResponse,
+  (self: ServerResponse.HttpServerResponse, body: Body.HttpBody) => ServerResponse.HttpServerResponse
 >(2, (self, body) => {
   let headers = self.headers
   if (body._tag === "Empty") {
@@ -485,7 +495,7 @@ export const setBody = dual<
 })
 
 /** @internal */
-export const toWeb = (response: ServerResponse.ServerResponse, withoutBody = false): Response => {
+export const toWeb = (response: ServerResponse.HttpServerResponse, withoutBody = false): Response => {
   const headers = new globalThis.Headers(response.headers)
   if (!Cookies.isEmpty(response.cookies)) {
     const toAdd = Cookies.toSetCookieHeaders(response.cookies)