effect 4.0.0-beta.30 → 4.0.0-beta.32

package/src/unstable/http/HttpClientRequest.ts

@@ -6,6 +6,7 @@ import type * as FileSystem from "../../FileSystem.ts"
 import { dual } from "../../Function.ts"
 import * as Inspectable from "../../Inspectable.ts"
 import { stringOrRedacted } from "../../internal/redacted.ts"
+import * as Option from "../../Option.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import type * as PlatformError from "../../PlatformError.ts"
 import { hasProperty } from "../../Predicate.ts"
@@ -37,7 +38,7 @@ export interface HttpClientRequest extends Inspectable.Inspectable, Pipeable {
   readonly method: HttpMethod
   readonly url: string
   readonly urlParams: UrlParams.UrlParams
-  readonly hash: string | undefined
+  readonly hash: Option.Option<string>
   readonly headers: Headers.Headers
   readonly body: HttpBody.HttpBody
 }
@@ -95,7 +96,7 @@ export function makeWith(
   method: HttpMethod,
   url: string,
   urlParams: UrlParams.UrlParams,
-  hash: string | undefined,
+  hash: Option.Option<string>,
   headers: Headers.Headers,
   body: HttpBody.HttpBody
 ): HttpClientRequest {
@@ -117,7 +118,7 @@ export const empty: HttpClientRequest = makeWith(
   "GET",
   "",
   UrlParams.empty,
-  undefined,
+  Option.none(),
   Headers.empty,
   HttpBody.empty
 )
@@ -409,7 +410,7 @@ export const setUrl: {
   }
   const clone = new URL(url.toString())
   const urlParams = UrlParams.fromInput(clone.searchParams)
-  const hash = clone.hash ? clone.hash.slice(1) : undefined
+  const hash = Option.fromNullishOr(clone.hash === "" ? undefined : clone.hash.slice(1))
   clone.search = ""
   clone.hash = ""
   return makeWith(
@@ -633,7 +634,7 @@ export const setHash: {
     self.method,
     self.url,
     self.urlParams,
-    hash,
+    Option.some(hash),
     self.headers,
     self.body
   ))
@@ -647,7 +648,7 @@ export const removeHash = (self: HttpClientRequest): HttpClientRequest =>
     self.method,
     self.url,
     self.urlParams,
-    undefined,
+    Option.none(),
     self.headers,
     self.body
   )
@@ -946,9 +947,10 @@ export const bodyFile: {
  * @since 4.0.0
  * @category combinators
  */
-export function toUrl(self: HttpClientRequest): URL | undefined {
-  const r = UrlParams.makeUrl(self.url, self.urlParams, self.hash)
+export function toUrl(self: HttpClientRequest): Option.Option<URL> {
+  const r = UrlParams.makeUrl(self.url, self.urlParams, Option.getOrUndefined(self.hash))
   if (Result.isSuccess(r)) {
-    return r.success
+    return Option.some(r.success)
   }
+  return Option.none()
 }

package/src/unstable/http/HttpClientResponse.ts

@@ -4,6 +4,7 @@
 import * as Effect from "../../Effect.ts"
 import { dual } from "../../Function.ts"
 import * as Inspectable from "../../Inspectable.ts"
+import * as Option from "../../Option.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
@@ -270,8 +271,8 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
     return this.cachedCookies = Cookies.fromSetCookie(this.source.headers.getSetCookie())
   }
 
-  get remoteAddress(): string | undefined {
-    return undefined
+  get remoteAddress(): Option.Option<string> {
+    return Option.none()
   }
 
   get stream(): Stream.Stream<Uint8Array, Error.HttpClientError> {
@@ -298,10 +299,10 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
       )
   }
 
-  get json(): Effect.Effect<unknown, Error.HttpClientError> {
+  get json(): Effect.Effect<Schema.Json, Error.HttpClientError> {
     return Effect.flatMap(this.text, (text) =>
       Effect.try({
-        try: () => text === "" ? null : JSON.parse(text) as unknown,
+        try: () => text === "" ? null : JSON.parse(text),
         catch: (cause) =>
           new Error.HttpClientError({
             reason: new Error.DecodeError({

package/src/unstable/http/HttpIncomingMessage.ts

@@ -4,6 +4,7 @@
 import * as Effect from "../../Effect.ts"
 import type * as FileSystem from "../../FileSystem.ts"
 import type * as Inspectable from "../../Inspectable.ts"
+import type * as Option from "../../Option.ts"
 import { hasProperty } from "../../Predicate.ts"
 import { redact } from "../../Redactable.ts"
 import * as Schema from "../../Schema.ts"
@@ -32,8 +33,8 @@ export const isHttpIncomingMessage = (u: unknown): u is HttpIncomingMessage => h
 export interface HttpIncomingMessage<E = unknown> extends Inspectable.Inspectable {
   readonly [TypeId]: typeof TypeId
   readonly headers: Headers.Headers
-  readonly remoteAddress: string | undefined
-  readonly json: Effect.Effect<unknown, E>
+  readonly remoteAddress: Option.Option<string>
+  readonly json: Effect.Effect<Schema.Json, E>
   readonly text: Effect.Effect<string, E>
   readonly urlParamsBody: Effect.Effect<UrlParams.UrlParams, E>
   readonly arrayBuffer: Effect.Effect<ArrayBuffer, E>

package/src/unstable/http/HttpMiddleware.ts

@@ -6,6 +6,7 @@ import * as Effect from "../../Effect.ts"
 import { constant, constFalse } from "../../Function.ts"
 import * as internalEffect from "../../internal/effect.ts"
 import * as Layer from "../../Layer.ts"
+import * as Option from "../../Option.ts"
 import type { Predicate } from "../../Predicate.ts"
 import type { ReadonlyRecord } from "../../Record.ts"
 import { TracerEnabled } from "../../References.ts"
@@ -102,7 +103,7 @@ export const logger: <E, R>(
         } else if (exit._tag === "Failure") {
           const [response, cause] = causeResponseStripped(exit.cause)
           return Effect.andThen(
-            Effect.annotateLogs(Effect.log(cause ?? "Sent HTTP Response"), {
+            Effect.annotateLogs(Effect.log(Option.getOrElse(cause, () => "Sent HTTP Response")), {
               "http.method": request.method,
               "http.url": request.url,
               "http.status": response.status
@@ -139,7 +140,7 @@ export const tracer: <E, R>(
     }
     const nameGenerator = fiber.getRef(SpanNameGenerator)
     const span = internalEffect.makeSpanUnsafe(fiber, nameGenerator(request), {
-      parent: TraceContext.fromHeaders(request.headers),
+      parent: Option.getOrUndefined(TraceContext.fromHeaders(request.headers)),
       kind: "server"
     })
     const prevServices = fiber.services
@@ -147,23 +148,23 @@ export const tracer: <E, R>(
     return Effect.onExitPrimitive(httpApp, (exit) => {
       fiber.setServices(prevServices)
       const endTime = fiber.getRef(Clock).currentTimeNanosUnsafe()
-      fiber.currentScheduler.scheduleTask(() => {
+      fiber.currentDispatcher.scheduleTask(() => {
         const url = Request.toURL(request)
-        if (url !== undefined && (url.username !== "" || url.password !== "")) {
-          url.username = "REDACTED"
-          url.password = "REDACTED"
+        if (Option.isSome(url) && (url.value.username !== "" || url.value.password !== "")) {
+          url.value.username = "REDACTED"
+          url.value.password = "REDACTED"
         }
         const redactedHeaderNames = fiber.getRef(Headers.CurrentRedactedNames)
         const requestHeaders = Headers.redact(request.headers, redactedHeaderNames)
         span.attribute("http.request.method", request.method)
-        if (url !== undefined) {
-          span.attribute("url.full", url.toString())
-          span.attribute("url.path", url.pathname)
-          const query = url.search.slice(1)
+        if (Option.isSome(url)) {
+          span.attribute("url.full", url.value.toString())
+          span.attribute("url.path", url.value.pathname)
+          const query = url.value.search.slice(1)
           if (query !== "") {
-            span.attribute("url.query", url.search.slice(1))
+            span.attribute("url.query", url.value.search.slice(1))
           }
-          span.attribute("url.scheme", url.protocol.slice(0, -1))
+          span.attribute("url.scheme", url.value.protocol.slice(0, -1))
         }
         if (request.headers["user-agent"] !== undefined) {
           span.attribute("user_agent.original", request.headers["user-agent"])
@@ -171,8 +172,8 @@ export const tracer: <E, R>(
         for (const name in requestHeaders) {
           span.attribute(`http.request.header.${name}`, String(requestHeaders[name]))
         }
-        if (request.remoteAddress !== undefined) {
-          span.attribute("client.address", request.remoteAddress)
+        if (Option.isSome(request.remoteAddress)) {
+          span.attribute("client.address", request.remoteAddress.value)
         }
         const response = exitResponse(exit)
         span.attribute("http.response.status_code", response.status)
@@ -200,7 +201,7 @@ export const xForwardedHeaders = make((httpApp) =>
           "host",
           request.headers["x-forwarded-host"]
         ),
-        remoteAddress: request.headers["x-forwarded-for"]?.split(",")[0].trim()
+        remoteAddress: Option.fromNullishOr(request.headers["x-forwarded-for"]?.split(",")[0].trim())
       })
       : request)
 )

package/src/unstable/http/HttpPlatform.ts

@@ -5,6 +5,7 @@ import * as Effect from "../../Effect.ts"
 import * as FileSystem from "../../FileSystem.ts"
 import { identity } from "../../Function.ts"
 import * as Layer from "../../Layer.ts"
+import * as Option from "../../Option.ts"
 import type { PlatformError } from "../../PlatformError.ts"
 import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
@@ -80,8 +81,8 @@ export const make: (impl: {
         "etag",
         Etag.toString(etag)
       )
-      if (info.mtime) {
-        ;(headers as any)["last-modified"] = info.mtime.toUTCString()
+      if (Option.isSome(info.mtime)) {
+        ;(headers as any)["last-modified"] = info.mtime.value.toUTCString()
       }
       const contentLength = end !== undefined ? end - start : Number(info.size) - start
       return impl.fileResponse(

package/src/unstable/http/HttpRouter.ts

@@ -5,6 +5,7 @@ import * as Arr from "../../Array.ts"
 import * as Effect from "../../Effect.ts"
 import { compose, dual, identity } from "../../Function.ts"
 import * as Layer from "../../Layer.ts"
+import * as Option from "../../Option.ts"
 import type { ReadonlyRecord } from "../../Record.ts"
 import * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
@@ -12,7 +13,6 @@ import * as Scope from "../../Scope.ts"
 import * as ServiceMap from "../../ServiceMap.ts"
 import * as Tracer from "../../Tracer.ts"
 import type * as Types from "../../Types.ts"
-import * as UndefinedOr from "../../UndefinedOr.ts"
 import * as FindMyWay from "./FindMyWay.ts"
 import * as HttpEffect from "./HttpEffect.ts"
 import type * as HttpMethod from "./HttpMethod.ts"
@@ -177,8 +177,8 @@ export const make = Effect.gen(function*() {
           )
         }
         const route = result.handler
-        if (route.prefix !== undefined) {
-          contextMap.set(HttpServerRequest.HttpServerRequest.key, sliceRequestUrl(request, route.prefix))
+        if (Option.isSome(route.prefix)) {
+          contextMap.set(HttpServerRequest.HttpServerRequest.key, sliceRequestUrl(request, route.prefix.value))
         }
         contextMap.set(HttpServerRequest.ParsedSearchParams.key, result.searchParams)
         contextMap.set(RouteContext.key, {
@@ -501,7 +501,7 @@ export interface Route<E = never, R = never> {
   readonly path: PathInput
   readonly handler: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>
   readonly uninterruptible: boolean
-  readonly prefix: string | undefined
+  readonly prefix: Option.Option<string>
 }
 
 /**
@@ -527,12 +527,12 @@ const makeRoute = <E, R>(options: {
   readonly path: PathInput
   readonly handler: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>
   readonly uninterruptible?: boolean | undefined
-  readonly prefix?: string | undefined
+  readonly prefix?: Option.Option<string> | string | undefined
 }): Route<E, Exclude<R, Provided>> =>
   (({
     ...options,
     uninterruptible: options.uninterruptible ?? false,
-    prefix: options.prefix,
+    prefix: typeof options.prefix === "string" ? Option.some(options.prefix) : options.prefix ?? Option.none(),
     [RouteTypeId]: RouteTypeId
   }) as Route<E, Exclude<R, Provided>>)
 
@@ -614,9 +614,9 @@ export const prefixRoute: {
   makeRoute({
     ...self,
     path: prefixPath(self.path, prefix) as PathInput,
-    prefix: UndefinedOr.match(self.prefix, {
-      onUndefined: () => prefix as string,
-      onDefined: (existingPrefix) => prefixPath(existingPrefix, prefix) as string
+    prefix: Option.match(self.prefix, {
+      onNone: () => prefix as string,
+      onSome: (existingPrefix) => prefixPath(existingPrefix, prefix) as string
     })
   }))
 

package/src/unstable/http/HttpServer.ts

@@ -36,6 +36,7 @@ export class HttpServer extends ServiceMap.Service<HttpServer, {
       Exclude<R, HttpServerRequest> | Scope.Scope
     >
   }
+
   readonly address: Address
 }>()("effect/http/HttpServer") {}
 
@@ -127,10 +128,7 @@ export const serve: {
   HttpServer | Exclude<Effect.Services<App>, HttpServerRequest | Scope.Scope>
 > =>
   Layer.effectDiscard(
-    Effect.flatMap(
-      HttpServer.asEffect(),
-      (server) => server.serve(effect, middleware!)
-    )
+    HttpServer.use((server) => server.serve(effect, middleware!))
   ) as any)
 
 /**
@@ -180,11 +178,7 @@ export const serveEffect: {
   void,
   never,
   Scope.Scope | HttpServer | Exclude<Effect.Services<App>, HttpServerRequest>
-> =>
-  Effect.flatMap(
-    HttpServer.asEffect(),
-    (server) => server.serve(effect, middleware!)
-  ) as any)
+> => HttpServer.use((server) => server.serve(effect, middleware!)) as any)
 
 /**
  * @since 4.0.0

package/src/unstable/http/HttpServerError.ts

@@ -7,6 +7,7 @@ import * as Effect from "../../Effect.ts"
 import * as ErrorReporter from "../../ErrorReporter.ts"
 import type * as Exit from "../../Exit.ts"
 import { constUndefined } from "../../Function.ts"
+import * as Option from "../../Option.ts"
 import { hasProperty } from "../../Predicate.ts"
 import * as ServiceMap from "../../ServiceMap.ts"
 import type * as Request from "./HttpServerRequest.ts"
@@ -256,7 +257,7 @@ export const causeResponse = <E>(
  */
 export const causeResponseStripped = <E>(
   cause: Cause.Cause<E>
-): readonly [response: Response.HttpServerResponse, cause: Cause.Cause<E> | undefined] => {
+): readonly [response: Response.HttpServerResponse, cause: Option.Option<Cause.Cause<E>>] => {
   let response: Response.HttpServerResponse | undefined
   const failures = cause.reasons.filter((f) => {
     if (f._tag === "Die" && Response.isHttpServerResponse(f.defect)) {
@@ -267,7 +268,7 @@ export const causeResponseStripped = <E>(
   })
   return [
     response ?? internalServerError,
-    failures.length > 0 ? Cause.fromReasons(failures) : undefined
+    failures.length > 0 ? Option.some(Cause.fromReasons(failures)) : Option.none()
   ]
 }
 

package/src/unstable/http/HttpServerRequest.ts

@@ -6,6 +6,7 @@ import * as Channel from "../../Channel.ts"
 import * as Effect from "../../Effect.ts"
 import type * as FileSystem from "../../FileSystem.ts"
 import * as Inspectable from "../../Inspectable.ts"
+import * as Option from "../../Option.ts"
 import type * as Path from "../../Path.ts"
 import type { ReadonlyRecord } from "../../Record.ts"
 import * as Result from "../../Result.ts"
@@ -64,7 +65,7 @@ export interface HttpServerRequest extends HttpIncomingMessage.HttpIncomingMessa
     options: {
       readonly url?: string
       readonly headers?: Headers.Headers
-      readonly remoteAddress?: string
+      readonly remoteAddress?: Option.Option<string>
     }
   ) => HttpServerRequest
 }
@@ -284,7 +285,10 @@ export const schemaBodyFormJson = <A, I, RD, RE>(
  * @category conversions
  */
 export const fromClientRequest = (request: HttpClientRequest.HttpClientRequest): HttpServerRequest => {
-  const url = HttpClientRequest.toUrl(request)?.toString() ?? request.url
+  const url = Option.match(HttpClientRequest.toUrl(request), {
+    onNone: () => request.url,
+    onSome: (url) => url.toString()
+  })
   return new ClientRequestImpl(request, url)
 }
 
@@ -305,11 +309,11 @@ export const toClientRequest = (request: HttpServerRequest): HttpClientRequest.H
       request.method,
       "",
       UrlParams.empty,
-      undefined,
+      Option.none(),
       request.headers,
       toClientBody(request)
     ),
-    toURL(request) ?? request.url
+    Option.getOrElse(toURL(request), () => request.url)
   )
 
 const toClientBody = (request: HttpServerRequest): HttpBody.HttpBody =>
@@ -343,13 +347,13 @@ class ServerRequestImpl extends Inspectable.Class implements HttpServerRequest {
   readonly source: Request
   readonly url: string
   public headersOverride?: Headers.Headers | undefined
-  private remoteAddressOverride?: string | undefined
+  private remoteAddressOverride?: Option.Option<string> | undefined
 
   constructor(
     source: Request,
     url: string,
     headersOverride?: Headers.Headers,
-    remoteAddressOverride?: string
+    remoteAddressOverride?: Option.Option<string>
   ) {
     super()
     this[TypeId] = TypeId
@@ -370,14 +374,14 @@ class ServerRequestImpl extends Inspectable.Class implements HttpServerRequest {
     options: {
       readonly url?: string | undefined
       readonly headers?: Headers.Headers | undefined
-      readonly remoteAddress?: string | undefined
+      readonly remoteAddress?: Option.Option<string> | undefined
     }
   ) {
     return new ServerRequestImpl(
       this.source,
       options.url ?? this.url,
       options.headers ?? this.headersOverride,
-      options.remoteAddress ?? this.remoteAddressOverride
+      "remoteAddress" in options ? options.remoteAddress : this.remoteAddressOverride
     )
   }
   get method(): HttpMethod {
@@ -386,8 +390,8 @@ class ServerRequestImpl extends Inspectable.Class implements HttpServerRequest {
   get originalUrl() {
     return this.source.url
   }
-  get remoteAddress(): string | undefined {
-    return this.remoteAddressOverride ? this.remoteAddressOverride : undefined
+  get remoteAddress(): Option.Option<string> {
+    return this.remoteAddressOverride ?? Option.none()
   }
   get headers(): Headers.Headers {
     this.headersOverride ??= Headers.fromInput(this.source.headers as any)
@@ -444,10 +448,10 @@ class ServerRequestImpl extends Inspectable.Class implements HttpServerRequest {
     return this.textEffect
   }
 
-  get json(): Effect.Effect<unknown, HttpServerError> {
+  get json(): Effect.Effect<Schema.Json, HttpServerError> {
     return Effect.flatMap(this.text, (text) =>
       Effect.try({
-        try: () => JSON.parse(text) as unknown,
+        try: () => JSON.parse(text) as Schema.Json,
         catch: (cause) =>
           new HttpServerError({
             reason: new RequestParseError({
@@ -538,7 +542,7 @@ class ClientRequestImpl extends Inspectable.Class implements HttpServerRequest {
   readonly source: HttpClientRequest.HttpClientRequest
   public originalUrl: string
   public headersOverride?: Headers.Headers | undefined
-  private remoteAddressOverride?: string | undefined
+  private remoteAddressOverride?: Option.Option<string> | undefined
   private urlOverride?: string | undefined
 
   constructor(
@@ -546,7 +550,7 @@ class ClientRequestImpl extends Inspectable.Class implements HttpServerRequest {
     originalUrl: string,
     urlOverride?: string,
     headersOverride?: Headers.Headers,
-    remoteAddressOverride?: string
+    remoteAddressOverride?: Option.Option<string>
   ) {
     super()
     this[TypeId] = TypeId
@@ -570,7 +574,7 @@ class ClientRequestImpl extends Inspectable.Class implements HttpServerRequest {
     options: {
       readonly url?: string | undefined
       readonly headers?: Headers.Headers | undefined
-      readonly remoteAddress?: string | undefined
+      readonly remoteAddress?: Option.Option<string> | undefined
     }
   ) {
     return new ClientRequestImpl(
@@ -578,7 +582,7 @@ class ClientRequestImpl extends Inspectable.Class implements HttpServerRequest {
       this.originalUrl,
       options.url ?? this.url,
       options.headers ?? this.headersOverride,
-      options.remoteAddress ?? this.remoteAddressOverride
+      "remoteAddress" in options ? options.remoteAddress : this.remoteAddressOverride
     )
   }
 
@@ -590,8 +594,8 @@ class ClientRequestImpl extends Inspectable.Class implements HttpServerRequest {
     return this.urlOverride ?? removeHost(this.originalUrl)
   }
 
-  get remoteAddress(): string | undefined {
-    return this.remoteAddressOverride ? this.remoteAddressOverride : undefined
+  get remoteAddress(): Option.Option<string> {
+    return this.remoteAddressOverride ?? Option.none()
   }
 
   get headers(): Headers.Headers {
@@ -664,10 +668,10 @@ class ClientRequestImpl extends Inspectable.Class implements HttpServerRequest {
     return Effect.map(this.bytes, (bytes) => textDecoder.decode(bytes))
   }
 
-  get json(): Effect.Effect<unknown, HttpServerError> {
+  get json(): Effect.Effect<Schema.Json, HttpServerError> {
     return Effect.flatMap(this.text, (text) =>
       Effect.try({
-        try: () => text === "" ? null : JSON.parse(text) as unknown,
+        try: () => text === "" ? null : JSON.parse(text),
         catch: (cause) => requestParseError(this, undefined, cause)
       }))
   }
@@ -877,13 +881,13 @@ const textDecoder = new TextDecoder()
  * @since 4.0.0
  * @category conversions
  */
-export const toURL = (self: HttpServerRequest): URL | undefined => {
+export const toURL = (self: HttpServerRequest): Option.Option<URL> => {
   const host = self.headers.host ?? "localhost"
   const protocol = self.headers["x-forwarded-proto"] === "https" ? "https" : "http"
   try {
-    return new URL(self.url, `${protocol}://${host}`)
+    return Option.some(new URL(self.url, `${protocol}://${host}`))
   } catch {
-    return undefined
+    return Option.none()
   }
 }
 
@@ -899,7 +903,7 @@ export const toWebResult = (self: HttpServerRequest, options?: {
     return Result.succeed(self.source)
   }
   const url = toURL(self)
-  if (url === undefined) {
+  if (Option.isNone(url)) {
     return Result.fail(
       new RequestParseError({
         request: self,
@@ -918,7 +922,7 @@ export const toWebResult = (self: HttpServerRequest, options?: {
     requestInit.body = Stream.toReadableStreamWith(self.stream, options?.services ?? ServiceMap.empty())
     ;(requestInit as any).duplex = "half"
   }
-  return Result.succeed(new Request(url, requestInit))
+  return Result.succeed(new Request(url.value, requestInit))
 }
 
 /**

package/src/unstable/http/HttpServerResponse.ts

@@ -7,6 +7,7 @@ import type * as FileSystem from "../../FileSystem.ts"
 import { dual } from "../../Function.ts"
 import * as Inspectable from "../../Inspectable.ts"
 import { PipeInspectableProto } from "../../internal/core.ts"
+import * as Option from "../../Option.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import type { PlatformError } from "../../PlatformError.ts"
 import { hasProperty } from "../../Predicate.ts"
@@ -965,8 +966,8 @@ class ServerHttpClientResponse extends Inspectable.Class implements HttpClientRe
     return this.response.cookies
   }
 
-  get remoteAddress(): string | undefined {
-    return undefined
+  get remoteAddress(): Option.Option<string> {
+    return Option.none()
   }
 
   get stream(): Stream.Stream<Uint8Array, HttpClientError.HttpClientError> {
@@ -1015,10 +1016,10 @@ class ServerHttpClientResponse extends Inspectable.Class implements HttpClientRe
     }
   }
 
-  get json(): Effect.Effect<unknown, HttpClientError.HttpClientError> {
+  get json(): Effect.Effect<Schema.Json, HttpClientError.HttpClientError> {
     return Effect.flatMap(this.text, (text) =>
       Effect.try({
-        try: () => text === "" ? null : JSON.parse(text) as unknown,
+        try: () => text === "" ? null : JSON.parse(text),
         catch: (cause) =>
           new HttpClientError.HttpClientError({
             reason: new HttpClientError.DecodeError({
@@ -1137,7 +1138,7 @@ export const fromClientResponse = (
     cookies: response.cookies,
     body: Body.stream(
       Stream.catchIf(response.stream, isEmptyBodyError, () => Stream.empty),
-      Headers.get(headers, "content-type"),
+      Option.getOrUndefined(Headers.get(headers, "content-type")),
       getContentLength(headers)
     )
   })
@@ -1152,7 +1153,7 @@ const isEmptyBodyError = (
   HttpClientError.isHttpClientError(error) && error.reason._tag === "EmptyBodyError"
 
 const getContentLength = (headers: Headers.Headers): number | undefined => {
-  const contentLength = Headers.get(headers, "content-length")
+  const contentLength = Option.getOrUndefined(Headers.get(headers, "content-length"))
   if (contentLength === undefined) {
     return undefined
   }