effect 4.0.0-beta.6 → 4.0.0-beta.62

package/src/unstable/http/HttpClientRequest.ts

@@ -1,11 +1,13 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 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"
@@ -14,10 +16,10 @@ import type * as Redacted from "../../Redacted.ts"
 import * as Result from "../../Result.ts"
 import type * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
-import type * as Stream from "../../Stream.ts"
+import * as Stream from "../../Stream.ts"
 import * as Headers from "./Headers.ts"
 import * as HttpBody from "./HttpBody.ts"
-import type { HttpMethod } from "./HttpMethod.ts"
+import { hasBody, type HttpMethod } from "./HttpMethod.ts"
 import * as UrlParams from "./UrlParams.ts"
 
 const TypeId = "~effect/http/HttpClientRequest"
@@ -37,7 +39,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
 }
@@ -61,12 +63,6 @@ export interface Options {
  * @since 4.0.0
  */
 export declare namespace Options {
-  /**
-   * @since 4.0.0
-   * @category models
-   */
-  export interface NoBody extends Omit<Options, "method" | "url" | "body"> {}
-
   /**
    * @since 4.0.0
    * @category models
@@ -93,11 +89,15 @@ const Proto = {
   }
 }
 
-function makeProto(
+/**
+ * @since 4.0.0
+ * @category constructors
+ */
+export function makeWith(
   method: HttpMethod,
   url: string,
   urlParams: UrlParams.UrlParams,
-  hash: string | undefined,
+  hash: Option.Option<string>,
   headers: Headers.Headers,
   body: HttpBody.HttpBody
 ): HttpClientRequest {
@@ -115,11 +115,11 @@ function makeProto(
  * @since 4.0.0
  * @category constructors
  */
-export const empty: HttpClientRequest = makeProto(
+export const empty: HttpClientRequest = makeWith(
   "GET",
   "",
   UrlParams.empty,
-  undefined,
+  Option.none(),
   Headers.empty,
   HttpBody.empty
 )
@@ -133,7 +133,7 @@ export const make = <M extends HttpMethod>(
 ) =>
 (
   url: string | URL,
-  options?: (M extends "GET" | "HEAD" ? Options.NoBody : Options.NoUrl) | undefined
+  options?: Options.NoUrl | undefined
 ): HttpClientRequest =>
   modify(empty, {
     method,
@@ -145,7 +145,7 @@ export const make = <M extends HttpMethod>(
  * @since 4.0.0
  * @category constructors
  */
-export const get: (url: string | URL, options?: Options.NoBody) => HttpClientRequest = make("GET")
+export const get: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("GET")
 
 /**
  * @since 4.0.0
@@ -165,23 +165,33 @@ export const patch: (url: string | URL, options?: Options.NoUrl) => HttpClientRe
  */
 export const put: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("PUT")
 
+const del: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("DELETE")
+
+export {
+  /**
+   * @since 4.0.0
+   * @category constructors
+   */
+  del as delete
+}
+
 /**
  * @since 4.0.0
  * @category constructors
  */
-export const del: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("DELETE")
+export const head: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("HEAD")
 
 /**
  * @since 4.0.0
  * @category constructors
  */
-export const head: (url: string | URL, options?: Options.NoBody) => HttpClientRequest = make("HEAD")
+export const options: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("OPTIONS")
 
 /**
  * @since 4.0.0
  * @category constructors
  */
-export const options: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("OPTIONS")
+export const trace: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = make("TRACE")
 
 /**
  * @since 4.0.0
@@ -247,7 +257,7 @@ export const setMethod: {
 } = dual(
   2,
   (self: HttpClientRequest, method: HttpMethod): HttpClientRequest =>
-    makeProto(method, self.url, self.urlParams, self.hash, self.headers, self.body)
+    makeWith(method, self.url, self.urlParams, self.hash, self.headers, self.body)
 )
 
 /**
@@ -266,7 +276,7 @@ export const setHeader: {
    */
   (self: HttpClientRequest, key: string, value: string): HttpClientRequest
 } = dual(3, (self: HttpClientRequest, key: string, value: string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     self.urlParams,
@@ -291,7 +301,7 @@ export const setHeaders: {
    */
   (self: HttpClientRequest, input: Headers.Input): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, input: Headers.Input): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     self.urlParams,
@@ -390,7 +400,7 @@ export const setUrl: {
   (self: HttpClientRequest, url: string | URL): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, url: string | URL): HttpClientRequest => {
   if (typeof url === "string") {
-    return makeProto(
+    return makeWith(
       self.method,
       url,
       self.urlParams,
@@ -401,10 +411,10 @@ 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 makeProto(
+  return makeWith(
     self.method,
     clone.toString(),
     urlParams,
@@ -431,7 +441,7 @@ export const prependUrl: {
   (self: HttpClientRequest, path: string): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, path: string): HttpClientRequest => {
   if (path === "") return self
-  return makeProto(
+  return makeWith(
     self.method,
     joinSegments(path, self.url),
     self.urlParams,
@@ -458,7 +468,7 @@ export const appendUrl: {
   (self: HttpClientRequest, path: string): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, path: string): HttpClientRequest => {
   if (path === "") return self
-  return makeProto(
+  return makeWith(
     self.method,
     joinSegments(self.url, path),
     self.urlParams,
@@ -496,7 +506,7 @@ export const updateUrl: {
    */
   (self: HttpClientRequest, f: (url: string) => string): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, f: (url: string) => string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     f(self.url),
     self.urlParams,
@@ -521,7 +531,7 @@ export const setUrlParam: {
    */
   (self: HttpClientRequest, key: string, value: string): HttpClientRequest
 } = dual(3, (self: HttpClientRequest, key: string, value: string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     UrlParams.set(self.urlParams, key, value),
@@ -546,7 +556,7 @@ export const setUrlParams: {
    */
   (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     UrlParams.setAll(self.urlParams, input),
@@ -571,7 +581,7 @@ export const appendUrlParam: {
    */
   (self: HttpClientRequest, key: string, value: string): HttpClientRequest
 } = dual(3, (self: HttpClientRequest, key: string, value: string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     UrlParams.append(self.urlParams, key, value),
@@ -596,7 +606,7 @@ export const appendUrlParams: {
    */
   (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     UrlParams.appendAll(self.urlParams, input),
@@ -621,11 +631,11 @@ export const setHash: {
    */
   (self: HttpClientRequest, hash: string): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, hash: string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     self.urlParams,
-    hash,
+    Option.some(hash),
     self.headers,
     self.body
   ))
@@ -635,11 +645,11 @@ export const setHash: {
  * @category combinators
  */
 export const removeHash = (self: HttpClientRequest): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     self.urlParams,
-    undefined,
+    Option.none(),
     self.headers,
     self.body
   )
@@ -671,7 +681,7 @@ export const setBody: {
       headers = Headers.set(headers, "content-length", body.contentLength.toString())
     }
   }
-  return makeProto(
+  return makeWith(
     self.method,
     self.url,
     self.urlParams,
@@ -938,9 +948,111 @@ 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()
+}
+
+/**
+ * @since 4.0.0
+ * @category conversions
+ */
+export const fromWeb = (request: globalThis.Request): HttpClientRequest => {
+  const method = request.method.toUpperCase() as HttpMethod
+  return modify(empty, {
+    method,
+    url: new URL(request.url),
+    headers: request.headers,
+    body: fromWebBody(request, method)
+  })
 }
+
+const fromWebBody = (request: globalThis.Request, method: HttpMethod): HttpBody.HttpBody => {
+  if (!hasBody(method) || request.body === null) {
+    return HttpBody.empty
+  }
+  return HttpBody.raw(request.body, {
+    contentType: request.headers.get("content-type") ?? undefined,
+    contentLength: parseContentLength(request.headers.get("content-length"))
+  })
+}
+
+const parseContentLength = (contentLength: string | null): number | undefined => {
+  if (contentLength === null) {
+    return undefined
+  }
+  const parsed = Number.parseInt(contentLength, 10)
+  return Number.isNaN(parsed) ? undefined : parsed
+}
+
+/**
+ * @since 4.0.0
+ * @category conversions
+ */
+export const toWebResult = (self: HttpClientRequest, options?: {
+  readonly signal?: AbortSignal | undefined
+  readonly context?: Context.Context<never> | undefined
+}): Result.Result<Request, UrlParams.UrlParamsError> => {
+  const url = UrlParams.makeUrl(self.url, self.urlParams, Option.getOrUndefined(self.hash))
+  if (Result.isFailure(url)) {
+    return Result.fail(url.failure)
+  }
+  const requestInit: RequestInit = {
+    method: self.method,
+    headers: self.headers
+  }
+  if (options?.signal) {
+    requestInit.signal = options.signal
+  }
+  if (hasBody(self.method)) {
+    switch (self.body._tag) {
+      case "Empty": {
+        break
+      }
+      case "Raw": {
+        requestInit.body = self.body.body as any
+        if (isReadableStream(self.body.body)) {
+          ;(requestInit as any).duplex = "half"
+        }
+        break
+      }
+      case "Uint8Array": {
+        requestInit.body = self.body.body as any
+        break
+      }
+      case "FormData": {
+        requestInit.body = self.body.formData
+        break
+      }
+      case "Stream": {
+        requestInit.body = Stream.toReadableStreamWith(self.body.stream, options?.context ?? Context.empty())
+        ;(requestInit as any).duplex = "half"
+        break
+      }
+    }
+  }
+  return Result.try({
+    try: () => new Request(url.success, requestInit),
+    catch: (cause) => new UrlParams.UrlParamsError({ cause })
+  })
+}
+
+const isReadableStream = (u: unknown): u is ReadableStream<Uint8Array> =>
+  typeof ReadableStream !== "undefined" && u instanceof ReadableStream
+
+/**
+ * @since 4.0.0
+ * @category conversions
+ */
+export const toWeb = (self: HttpClientRequest, options?: {
+  readonly signal?: AbortSignal | undefined
+}): Effect.Effect<Request, UrlParams.UrlParamsError> =>
+  Effect.contextWith((context) =>
+    toWebResult(self, {
+      context: context,
+      signal: options?.signal
+    }).asEffect()
+  )

package/src/unstable/http/HttpClientResponse.ts

@@ -4,6 +4,8 @@
 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"
 import * as Stream from "../../Stream.ts"
@@ -43,7 +45,7 @@ export const TypeId = "~effect/http/HttpClientResponse"
  * @since 4.0.0
  * @category models
  */
-export interface HttpClientResponse extends HttpIncomingMessage.HttpIncomingMessage<Error.HttpClientError> {
+export interface HttpClientResponse extends HttpIncomingMessage.HttpIncomingMessage<Error.HttpClientError>, Pipeable {
   readonly [TypeId]: typeof TypeId
   readonly request: HttpClientRequest.HttpClientRequest
   readonly status: number
@@ -227,7 +229,7 @@ export const filterStatusOk = (self: HttpClientResponse): Effect.Effect<HttpClie
 // internal
 // -----------------------------------------------------------------------------
 
-class WebHttpClientResponse extends Inspectable.Class implements HttpClientResponse {
+class WebHttpClientResponse extends Inspectable.Class implements HttpClientResponse, Pipeable {
   readonly [HttpIncomingMessage.TypeId]: typeof HttpIncomingMessage.TypeId
   readonly [TypeId]: typeof TypeId
 
@@ -269,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> {
@@ -297,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({
@@ -314,7 +316,10 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
 
   private textBody?: Effect.Effect<string, Error.HttpClientError>
   get text(): Effect.Effect<string, Error.HttpClientError> {
-    return this.textBody ??= Effect.tryPromise({
+    if (this.textBody) {
+      return this.textBody
+    }
+    this.textBody = Effect.tryPromise({
       try: () => this.source.text(),
       catch: (cause) =>
         new Error.HttpClientError({
@@ -325,6 +330,8 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
           })
         })
     }).pipe(Effect.cached, Effect.runSync)
+    this.arrayBufferBody = Effect.map(this.textBody, (_) => new TextEncoder().encode(_).buffer)
+    return this.textBody
   }
 
   get urlParamsBody(): Effect.Effect<UrlParams.UrlParams, Error.HttpClientError> {
@@ -359,7 +366,10 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
 
   private arrayBufferBody?: Effect.Effect<ArrayBuffer, Error.HttpClientError>
   get arrayBuffer(): Effect.Effect<ArrayBuffer, Error.HttpClientError> {
-    return this.arrayBufferBody ??= Effect.tryPromise({
+    if (this.arrayBufferBody) {
+      return this.arrayBufferBody
+    }
+    this.arrayBufferBody = Effect.tryPromise({
       try: () => this.source.arrayBuffer(),
       catch: (cause) =>
         new Error.HttpClientError({
@@ -370,5 +380,11 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
           })
         })
     }).pipe(Effect.cached, Effect.runSync)
+    this.textBody = Effect.map(this.arrayBufferBody, (_) => new TextDecoder().decode(_))
+    return this.arrayBufferBody
+  }
+
+  pipe() {
+    return pipeArguments(this, arguments)
   }
 }