@effect/platform 0.40.2 → 0.40.4

package/src/HttpServer.ts

@@ -6,6 +6,7 @@ import * as body from "./Http/Body.js"
 import * as headers from "./Http/Headers.js"
 import * as middleware from "./Http/Middleware.js"
 import * as multipart from "./Http/Multipart.js"
+import * as multiplex from "./Http/Multiplex.js"
 import * as router from "./Http/Router.js"
 import * as error from "./Http/ServerError.js"
 import * as request from "./Http/ServerRequest.js"
@@ -16,70 +17,77 @@ export {
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/App](https://effect-ts.github.io/effect/platform/Http/App.html)
+   * - Docs: [Http/App](https://effect-ts.github.io/effect/platform/Http/App.ts.html)
    * - Module: `@effect/platform/Http/App`
    */
   app,
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/Body](https://effect-ts.github.io/effect/platform/Http/Body.html)
+   * - Docs: [Http/Body](https://effect-ts.github.io/effect/platform/Http/Body.ts.html)
    * - Module: `@effect/platform/Http/Body`
    */
   body,
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/ServerError](https://effect-ts.github.io/effect/platform/Http/ServerError.html)
+   * - Docs: [Http/ServerError](https://effect-ts.github.io/effect/platform/Http/ServerError.ts.html)
    * - Module: `@effect/platform/Http/ServerError`
    */
   error,
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/Headers](https://effect-ts.github.io/effect/platform/Http/Headers.html)
+   * - Docs: [Http/Headers](https://effect-ts.github.io/effect/platform/Http/Headers.ts.html)
    * - Module: `@effect/platform/Http/Headers`
    */
   headers,
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/Middleware](https://effect-ts.github.io/effect/platform/Http/Middleware.html)
+   * - Docs: [Http/Middleware](https://effect-ts.github.io/effect/platform/Http/Middleware.ts.html)
    * - Module: `@effect/platform/Http/Middleware`
    */
   middleware,
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/Multipart](https://effect-ts.github.io/effect/platform/Http/Multipart.html)
+   * - Docs: [Http/Multipart](https://effect-ts.github.io/effect/platform/Http/Multipart.ts.html)
    * - Module: `@effect/platform/Http/Multipart`
    */
   multipart,
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/ServerRequest](https://effect-ts.github.io/effect/platform/Http/ServerRequest.html)
+   * - Docs: [Http/Multiplex](https://effect-ts.github.io/effect/platform/Http/Multiplex.ts.html)
+   * - Module: `@effect/platform/Http/Multiplex`
+   */
+  multiplex,
+  /**
+   * @since 1.0.0
+   *
+   * - Docs: [Http/ServerRequest](https://effect-ts.github.io/effect/platform/Http/ServerRequest.ts.html)
    * - Module: `@effect/platform/Http/ServerRequest`
    */
   request,
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/ServerResponse](https://effect-ts.github.io/effect/platform/Http/ServerResponse.html)
+   * - Docs: [Http/ServerResponse](https://effect-ts.github.io/effect/platform/Http/ServerResponse.ts.html)
    * - Module: `@effect/platform/Http/ServerResponse`
    */
   response,
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/Router](https://effect-ts.github.io/effect/platform/Http/Router.html)
+   * - Docs: [Http/Router](https://effect-ts.github.io/effect/platform/Http/Router.ts.html)
    * - Module: `@effect/platform/Http/Router`
    */
   router,
   /**
    * @since 1.0.0
    *
-   * - Docs: [Http/UrlParams](https://effect-ts.github.io/effect/platform/Http/UrlParams.html)
+   * - Docs: [Http/UrlParams](https://effect-ts.github.io/effect/platform/Http/UrlParams.ts.html)
    * - Module: `@effect/platform/Http/UrlParams`
    */
   urlParams

package/src/internal/http/multiplex.ts

@@ -0,0 +1,222 @@
+import * as Effect from "effect/Effect"
+import * as Effectable from "effect/Effectable"
+import { dual } from "effect/Function"
+import * as ReadonlyArray from "effect/ReadonlyArray"
+import type * as App from "../../Http/App.js"
+import type * as Multiplex from "../../Http/Multiplex.js"
+import * as Error from "../../Http/ServerError.js"
+import * as ServerRequest from "../../Http/ServerRequest.js"
+import type * as ServerResponse from "../../Http/ServerResponse.js"
+
+/** @internal */
+export const TypeId: Multiplex.TypeId = Symbol.for("@effect/platform/Http/Multiplex") as Multiplex.TypeId
+
+class MultiplexImpl<R, E>
+  extends Effectable.Class<R | ServerRequest.ServerRequest, E | Error.RouteNotFound, ServerResponse.ServerResponse>
+  implements Multiplex.Multiplex<R, E>
+{
+  readonly [TypeId]: Multiplex.TypeId
+
+  constructor(
+    readonly apps: ReadonlyArray<
+      readonly [
+        predicate: (request: ServerRequest.ServerRequest) => Effect.Effect<R, E, boolean>,
+        app: App.Default<R, E>
+      ]
+    >
+  ) {
+    super()
+    this[TypeId] = TypeId
+
+    let execute: (request: ServerRequest.ServerRequest) => App.Default<R, E | Error.RouteNotFound> = (request) =>
+      Effect.fail(Error.RouteNotFound({ request }))
+
+    for (let i = apps.length - 1; i >= 0; i--) {
+      const [predicate, app] = apps[i]
+      const previous = execute
+      execute = (request) =>
+        Effect.flatMap(
+          predicate(request),
+          (match) => match ? app : previous(request)
+        )
+    }
+
+    this.execute = Effect.flatMap(ServerRequest.ServerRequest, execute)
+  }
+
+  execute: App.Default<R, E | Error.RouteNotFound>
+
+  commit() {
+    return this.execute
+  }
+}
+
+/** @internal */
+export const empty: Multiplex.Multiplex<never, never> = new MultiplexImpl([])
+
+/** @internal */
+export const make = <R, E>(
+  apps: Iterable<
+    readonly [predicate: (request: ServerRequest.ServerRequest) => Effect.Effect<R, E, boolean>, app: App.Default<R, E>]
+  >
+): Multiplex.Multiplex<R, E> => new MultiplexImpl(ReadonlyArray.fromIterable(apps))
+
+/** @internal */
+export const add = dual<
+  <R2, E2, R3, E3>(
+    predicate: (request: ServerRequest.ServerRequest) => Effect.Effect<R2, E2, boolean>,
+    app: App.Default<R3, E3>
+  ) => <R, E>(self: Multiplex.Multiplex<R, E>) => Multiplex.Multiplex<R | R2 | R3, E | E2 | E3>,
+  <R, E, R2, E2, R3, E3>(
+    self: Multiplex.Multiplex<R, E>,
+    predicate: (request: ServerRequest.ServerRequest) => Effect.Effect<R2, E2, boolean>,
+    app: App.Default<R3, E3>
+  ) => Multiplex.Multiplex<R | R2 | R3, E | E2 | E3>
+>(
+  3,
+  (self, predicate, app) =>
+    make([
+      ...self.apps,
+      [predicate, app]
+    ] as any)
+)
+
+/** @internal */
+export const headerExact = dual<
+  <R2, E2>(
+    header: string,
+    value: string,
+    app: App.Default<R2, E2>
+  ) => <R, E>(self: Multiplex.Multiplex<R, E>) => Multiplex.Multiplex<R | R2, E | E2>,
+  <R, E, R2, E2>(
+    self: Multiplex.Multiplex<R, E>,
+    header: string,
+    value: string,
+    app: App.Default<R2, E2>
+  ) => Multiplex.Multiplex<R | R2, E | E2>
+>(
+  4,
+  (self, header, value, app) =>
+    add(self, (req) =>
+      req.headers[header] !== undefined
+        ? Effect.succeed(req.headers[header] === value)
+        : Effect.succeed(false), app)
+)
+
+/** @internal */
+export const headerRegex = dual<
+  <R2, E2>(
+    header: string,
+    regex: RegExp,
+    app: App.Default<R2, E2>
+  ) => <R, E>(self: Multiplex.Multiplex<R, E>) => Multiplex.Multiplex<R | R2, E | E2>,
+  <R, E, R2, E2>(
+    self: Multiplex.Multiplex<R, E>,
+    header: string,
+    regex: RegExp,
+    app: App.Default<R2, E2>
+  ) => Multiplex.Multiplex<R | R2, E | E2>
+>(
+  4,
+  (self, header, regex, app) =>
+    add(self, (req) =>
+      req.headers[header] !== undefined
+        ? Effect.succeed(regex.test(req.headers[header]))
+        : Effect.succeed(false), app)
+)
+
+/** @internal */
+export const headerStartsWith = dual<
+  <R2, E2>(
+    header: string,
+    prefix: string,
+    app: App.Default<R2, E2>
+  ) => <R, E>(self: Multiplex.Multiplex<R, E>) => Multiplex.Multiplex<R | R2, E | E2>,
+  <R, E, R2, E2>(
+    self: Multiplex.Multiplex<R, E>,
+    header: string,
+    prefix: string,
+    app: App.Default<R2, E2>
+  ) => Multiplex.Multiplex<R | R2, E | E2>
+>(
+  4,
+  (self, header, prefix, app) =>
+    add(self, (req) =>
+      req.headers[header] !== undefined
+        ? Effect.succeed(req.headers[header].startsWith(prefix))
+        : Effect.succeed(false), app)
+)
+
+/** @internal */
+export const headerEndsWith = dual<
+  <R2, E2>(
+    header: string,
+    suffix: string,
+    app: App.Default<R2, E2>
+  ) => <R, E>(self: Multiplex.Multiplex<R, E>) => Multiplex.Multiplex<R | R2, E | E2>,
+  <R, E, R2, E2>(
+    self: Multiplex.Multiplex<R, E>,
+    header: string,
+    suffix: string,
+    app: App.Default<R2, E2>
+  ) => Multiplex.Multiplex<R | R2, E | E2>
+>(
+  4,
+  (self, header, suffix, app) =>
+    add(self, (req) =>
+      req.headers[header] !== undefined
+        ? Effect.succeed(req.headers[header].endsWith(suffix))
+        : Effect.succeed(false), app)
+)
+
+/** @internal */
+export const hostRegex = dual<
+  <R2, E2>(
+    regex: RegExp,
+    app: App.Default<R2, E2>
+  ) => <R, E>(self: Multiplex.Multiplex<R, E>) => Multiplex.Multiplex<R | R2, E | E2>,
+  <R, E, R2, E2>(
+    self: Multiplex.Multiplex<R, E>,
+    regex: RegExp,
+    app: App.Default<R2, E2>
+  ) => Multiplex.Multiplex<R | R2, E | E2>
+>(3, (self, regex, app) => headerRegex(self, "host", regex, app))
+
+/** @internal */
+export const hostStartsWith = dual<
+  <R2, E2>(
+    prefix: string,
+    app: App.Default<R2, E2>
+  ) => <R, E>(self: Multiplex.Multiplex<R, E>) => Multiplex.Multiplex<R | R2, E | E2>,
+  <R, E, R2, E2>(
+    self: Multiplex.Multiplex<R, E>,
+    prefix: string,
+    app: App.Default<R2, E2>
+  ) => Multiplex.Multiplex<R | R2, E | E2>
+>(3, (self, prefix, app) => headerStartsWith(self, "host", prefix, app))
+
+/** @internal */
+export const hostEndsWith = dual<
+  <R2, E2>(
+    suffix: string,
+    app: App.Default<R2, E2>
+  ) => <R, E>(self: Multiplex.Multiplex<R, E>) => Multiplex.Multiplex<R | R2, E | E2>,
+  <R, E, R2, E2>(
+    self: Multiplex.Multiplex<R, E>,
+    suffix: string,
+    app: App.Default<R2, E2>
+  ) => Multiplex.Multiplex<R | R2, E | E2>
+>(3, (self, suffix, app) => headerEndsWith(self, "host", suffix, app))
+
+/** @internal */
+export const hostExact = dual<
+  <R2, E2>(
+    host: string,
+    app: App.Default<R2, E2>
+  ) => <R, E>(self: Multiplex.Multiplex<R, E>) => Multiplex.Multiplex<R | R2, E | E2>,
+  <R, E, R2, E2>(
+    self: Multiplex.Multiplex<R, E>,
+    host: string,
+    app: App.Default<R2, E2>
+  ) => Multiplex.Multiplex<R | R2, E | E2>
+>(3, (self, host, app) => headerExact(self, "host", host, app))

package/src/internal/http/router.ts

@@ -65,15 +65,15 @@ class RouterImpl<R, E> extends Effectable.StructuralClass<
   ) {
     super()
     this[TypeId] = TypeId
+    this.httpApp = toHttpApp(this) as any
   }
-  private httpApp:
-    | Effect.Effect<Exclude<R, Router.RouteContext>, E | Error.RouteNotFound, ServerResponse.ServerResponse>
-    | undefined
+  private httpApp: Effect.Effect<
+    Exclude<R, Router.RouteContext>,
+    E | Error.RouteNotFound,
+    ServerResponse.ServerResponse
+  >
   commit() {
-    if (this.httpApp === undefined) {
-      this.httpApp = toHttpApp(this) as any
-    }
-    return this.httpApp!
+    return this.httpApp
   }
   toJSON() {
     return {