@effect/platform-node 0.27.3 → 0.27.4

package/dist/Server-c315ddf2.esm.js

@@ -0,0 +1,57 @@
+import { m as make$1, a as makeHandler$1, l as layer$1, b as layerConfig$1 } from './server-442c5e69.esm.js';
+import * as Server$1 from '@effect/platform/Http/Server';
+
+function _mergeNamespaces(n, m) {
+  m.forEach(function (e) {
+    e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
+      if (k !== 'default' && !(k in n)) {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  });
+  return Object.freeze(n);
+}
+
+/**
+ * @since 1.0.0
+ *
+ * Also includes exports from [`@effect/platform/Http/Server`](https://effect-ts.github.io/platform/platform/Http/Server.ts.html).
+ */
+
+/**
+ * @since 1.0.0
+ * @category constructors
+ */
+const make = make$1;
+
+/**
+ * @since 1.0.0
+ * @category constructors
+ */
+const makeHandler = makeHandler$1;
+
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+const layer = layer$1;
+
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+const layerConfig = layerConfig$1;
+
+var Server = /*#__PURE__*/_mergeNamespaces({
+  __proto__: null,
+  make: make,
+  makeHandler: makeHandler,
+  layer: layer,
+  layerConfig: layerConfig
+}, [Server$1]);
+
+export { Server as S, makeHandler as a, layerConfig as b, layer as l, make as m };

package/dist/declarations/src/Http/Server.d.ts

@@ -5,8 +5,11 @@
  *
  * Also includes exports from [`@effect/platform/Http/Server`](https://effect-ts.github.io/platform/platform/Http/Server.ts.html).
  */
+import type * as App from "@effect/platform/Http/App";
+import type * as Middleware from "@effect/platform/Http/Middleware";
 import type * as Platform from "@effect/platform/Http/Platform";
 import type * as Server from "@effect/platform/Http/Server";
+import type * as ServerRequest from "@effect/platform/Http/ServerRequest";
 import type * as Config from "effect/Config";
 import type * as ConfigError from "effect/ConfigError";
 import type * as Effect from "effect/Effect";
@@ -24,6 +27,14 @@ export * from "@effect/platform/Http/Server";
  * @category constructors
  */
 export declare const make: (evaluate: LazyArg<Http.Server>, options: Net.ListenOptions) => Effect.Effect<Scope.Scope, never, Server.Server>;
+/**
+ * @since 1.0.0
+ * @category constructors
+ */
+export declare const makeHandler: {
+    <R, E>(httpApp: App.Default<R, E>): Effect.Effect<Exclude<R, ServerRequest.ServerRequest>, never, (nodeRequest: Http.IncomingMessage, nodeResponse: Http.ServerResponse<Http.IncomingMessage>) => void>;
+    <R, E, App extends App.Default<any, any>>(httpApp: App.Default<R, E>, middleware: Middleware.Middleware.Applied<R, E, App>): Effect.Effect<Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest>, never, (nodeRequest: Http.IncomingMessage, nodeResponse: Http.ServerResponse<Http.IncomingMessage>) => void>;
+};
 /**
  * @since 1.0.0
  * @category layers

package/dist/declarations/src/Http/Server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Server.d.ts","sourceRoot":"../../../../src/Http","sources":["Server.ts"],"names":[],"mappings":";;AAAA;;;;GAIG;AACH,OAAO,KAAK,KAAK,QAAQ,MAAM,gCAAgC,CAAA;AAC/D,OAAO,KAAK,KAAK,MAAM,MAAM,8BAA8B,CAAA;AAC3D,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAA;AACtC,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAA;AAGpC;;GAEG;AACH,cAAc,8BAA8B,CAAA;AAE5C;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,CACjB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAC9B,OAAO,EAAE,GAAG,CAAC,aAAa,KACvB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAiB,CAAA;AAErE;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,CAClB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,eAAe,EAAE,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,EACvF,OAAO,EAAE,GAAG,CAAC,aAAa,KACvB,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAkB,CAAA;AAElF;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,CACxB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,eAAe,EAAE,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,EACvF,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,KAC3C,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAwB,CAAA"}
+{"version":3,"file":"Server.d.ts","sourceRoot":"../../../../src/Http","sources":["Server.ts"],"names":[],"mappings":"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"}

package/dist/declarations/src/Http/ServerRequest.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="node" />
+/**
+ * @since 1.0.0
+ *
+ * Also includes exports from [`@effect/platform/Http/ServerRequest`](https://effect-ts.github.io/platform/platform/Http/ServerRequest.ts.html).
+ */
+import type * as ServerRequest from "@effect/platform/Http/ServerRequest";
+import type * as Http from "node:http";
+/**
+ * @since 1.0.0
+ */
+export * from "@effect/platform/Http/ServerRequest";
+/**
+ * @category conversions
+ * @since 1.0.0
+ */
+export declare const toIncomingMessage: (self: ServerRequest.ServerRequest) => Http.IncomingMessage;
+//# sourceMappingURL=ServerRequest.d.ts.map

package/dist/declarations/src/Http/ServerRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServerRequest.d.ts","sourceRoot":"../../../../src/Http","sources":["ServerRequest.ts"],"names":[],"mappings":";AAAA;;;;GAIG;AACH,OAAO,KAAK,KAAK,aAAa,MAAM,qCAAqC,CAAA;AACzE,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAA;AAGtC;;GAEG;AACH,cAAc,qCAAqC,CAAA;AAEnD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,aAAa,KAAK,IAAI,CAAC,eAAwC,CAAA"}

package/dist/declarations/src/HttpServer.d.ts

@@ -1,13 +1,13 @@
 /**
  * @since 1.0.0
  */
+import * as request from "./Http/ServerRequest.js";
 import * as app from "@effect/platform/Http/App";
 import * as body from "@effect/platform/Http/Body";
 import * as headers from "@effect/platform/Http/Headers";
 import * as middleware from "@effect/platform/Http/Middleware";
 import * as router from "@effect/platform/Http/Router";
 import * as error from "@effect/platform/Http/ServerError";
-import * as request from "@effect/platform/Http/ServerRequest";
 import * as response from "@effect/platform/Http/ServerResponse";
 import * as urlParams from "@effect/platform/Http/UrlParams";
 import * as etag from "./Http/Etag.js";
@@ -66,8 +66,8 @@ middleware,
 /**
  * @since 1.0.0
  *
- * - Docs: [Http/ServerRequest](https://effect-ts.github.io/platform/platform/Http/ServerRequest.ts.html)
- * - Module: `@effect/platform/Http/ServerRequest`
+ * - Docs: [Http/ServerRequest](https://effect-ts.github.io/platform/platform-node/Http/ServerRequest.ts.html)
+ * - Module: `@effect/platform-node/Http/ServerRequest`
  */
 request, 
 /**

package/dist/declarations/src/HttpServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpServer.d.ts","sourceRoot":"../../../src","sources":["HttpServer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,2BAA2B,CAAA;AAChD,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAA;AAClD,OAAO,KAAK,OAAO,MAAM,+BAA+B,CAAA;AACxD,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAA;AAC9D,OAAO,KAAK,MAAM,MAAM,8BAA8B,CAAA;AACtD,OAAO,KAAK,KAAK,MAAM,mCAAmC,CAAA;AAC1D,OAAO,KAAK,OAAO,MAAM,qCAAqC,CAAA;AAC9D,OAAO,KAAK,QAAQ,MAAM,sCAAsC,CAAA;AAChE,OAAO,KAAK,SAAS,MAAM,iCAAiC,CAAA;AAC5D,OAAO,KAAK,IAAI,uBAAmB;AACnC,OAAO,KAAK,QAAQ,2BAAuB;AAC3C,OAAO,KAAK,MAAM,yBAAqB;AAEvC,OAAO;AACL;;;;;GAKG;AACH,GAAG;AACH;;;;;GAKG;AACH,IAAI;AACJ;;;;;GAKG;AACH,KAAK;AACL;;;;;GAKG;AACH,IAAI;AACJ;;;;;GAKG;AACH,QAAQ;AACR;;;;;GAKG;AACH,OAAO;AACP;;;;;GAKG;AACH,UAAU;AACV;;;;;GAKG;AACH,OAAO;AACP;;;;;GAKG;AACH,QAAQ;AACR;;;;;GAKG;AACH,MAAM;AACN;;;;;GAKG;AACH,MAAM;AACN;;;;;GAKG;AACH,SAAS,EACV,CAAA"}
+{"version":3,"file":"HttpServer.d.ts","sourceRoot":"../../../src","sources":["HttpServer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,gCAAgD;AACnE,OAAO,KAAK,GAAG,MAAM,2BAA2B,CAAA;AAChD,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAA;AAClD,OAAO,KAAK,OAAO,MAAM,+BAA+B,CAAA;AACxD,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAA;AAC9D,OAAO,KAAK,MAAM,MAAM,8BAA8B,CAAA;AACtD,OAAO,KAAK,KAAK,MAAM,mCAAmC,CAAA;AAC1D,OAAO,KAAK,QAAQ,MAAM,sCAAsC,CAAA;AAChE,OAAO,KAAK,SAAS,MAAM,iCAAiC,CAAA;AAC5D,OAAO,KAAK,IAAI,uBAAmB;AACnC,OAAO,KAAK,QAAQ,2BAAuB;AAC3C,OAAO,KAAK,MAAM,yBAAqB;AAEvC,OAAO;AACL;;;;;GAKG;AACH,GAAG;AACH;;;;;GAKG;AACH,IAAI;AACJ;;;;;GAKG;AACH,KAAK;AACL;;;;;GAKG;AACH,IAAI;AACJ;;;;;GAKG;AACH,QAAQ;AACR;;;;;GAKG;AACH,OAAO;AACP;;;;;GAKG;AACH,UAAU;AACV;;;;;GAKG;AACH,OAAO;AACP;;;;;GAKG;AACH,QAAQ;AACR;;;;;GAKG;AACH,MAAM;AACN;;;;;GAKG;AACH,MAAM;AACN;;;;;GAKG;AACH,SAAS,EACV,CAAA"}

package/dist/{Server-9108df65.cjs.prod.js → server-42346e37.cjs.prod.js}

@@ -4,7 +4,7 @@ var FileSystem = require('@effect/platform/FileSystem');
 var App = require('@effect/platform/Http/App');
 var IncomingMessage = require('@effect/platform/Http/IncomingMessage');
 var Middleware = require('@effect/platform/Http/Middleware');
-var Server$1 = require('@effect/platform/Http/Server');
+var Server = require('@effect/platform/Http/Server');
 var Error = require('@effect/platform/Http/ServerError');
 var ServerRequest = require('@effect/platform/Http/ServerRequest');
 var Config = require('effect/Config');
@@ -39,26 +39,11 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-function _mergeNamespaces(n, m) {
-  m.forEach(function (e) {
-    e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
-      if (k !== 'default' && !(k in n)) {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  });
-  return Object.freeze(n);
-}
-
 var FileSystem__namespace = /*#__PURE__*/_interopNamespace(FileSystem);
 var App__namespace = /*#__PURE__*/_interopNamespace(App);
 var IncomingMessage__namespace = /*#__PURE__*/_interopNamespace(IncomingMessage);
 var Middleware__namespace = /*#__PURE__*/_interopNamespace(Middleware);
-var Server__namespace = /*#__PURE__*/_interopNamespace(Server$1);
+var Server__namespace = /*#__PURE__*/_interopNamespace(Server);
 var Error__namespace = /*#__PURE__*/_interopNamespace(Error);
 var ServerRequest__namespace = /*#__PURE__*/_interopNamespace(ServerRequest);
 var Config__namespace = /*#__PURE__*/_interopNamespace(Config);
@@ -70,7 +55,7 @@ var Runtime__namespace = /*#__PURE__*/_interopNamespace(Runtime);
 var Stream__namespace = /*#__PURE__*/_interopNamespace(Stream);
 
 /** @internal */
-const make$1 = (evaluate, options) => Effect__namespace.gen(function* (_) {
+const make = (evaluate, options) => Effect__namespace.gen(function* (_) {
   const server = evaluate();
   const serverFiber = yield* _(Effect__namespace.addFinalizer(() => Effect__namespace.async(resume => {
     server.close(error => {
@@ -102,24 +87,10 @@ const make$1 = (evaluate, options) => Effect__namespace.gen(function* (_) {
       hostname: address.address,
       port: address.port
     },
-    serve: (httpApp, middleware) => {
-      const handledApp = middleware ? middleware(App__namespace.withDefaultMiddleware(respond(httpApp))) : App__namespace.withDefaultMiddleware(respond(httpApp));
-      return Effect__namespace.flatMap(Effect__namespace.all([Effect__namespace.runtime(), Effect__namespace.fiberId]), ([runtime, fiberId]) => {
-        const runFork = Runtime__namespace.runFork(runtime);
-        function handler(nodeRequest, nodeResponse) {
-          const fiber = runFork(Effect__namespace.provideService(handledApp, ServerRequest__namespace.ServerRequest, new ServerRequestImpl(nodeRequest, nodeResponse)));
-          nodeResponse.on("close", () => {
-            if (!nodeResponse.writableEnded) {
-              runFork(fiber.interruptAsFork(fiberId));
-            }
-          });
-        }
-        return Effect__namespace.all([Effect__namespace.acquireRelease(Effect__namespace.sync(() => server.on("request", handler)), () => Effect__namespace.sync(() => server.off("request", handler))), Fiber__namespace.join(serverFiber)], {
-          discard: true,
-          concurrency: "unbounded"
-        });
-      });
-    }
+    serve: (httpApp, middleware) => Effect__namespace.flatMap(makeHandler(httpApp, middleware), handler => Effect__namespace.all([Effect__namespace.acquireRelease(Effect__namespace.sync(() => server.on("request", handler)), () => Effect__namespace.sync(() => server.off("request", handler))), Fiber__namespace.join(serverFiber)], {
+      discard: true,
+      concurrency: "unbounded"
+    }))
   });
 }).pipe(Effect__namespace.locally(IncomingMessage__namespace.maxBodySize, Option__namespace.some(FileSystem__namespace.Size(1024 * 1024 * 10))));
 const respond = /*#__PURE__*/Middleware__namespace.make(httpApp => Effect__namespace.flatMap(ServerRequest__namespace.ServerRequest, request => Effect__namespace.tapErrorCause(Effect__namespace.tap(Effect__namespace.flatMap(httpApp, response => Effect__namespace.flatMap(App__namespace.preResponseHandler, f => f(request, response))), response => handleResponse(request, response)), _cause => Effect__namespace.sync(() => {
@@ -131,6 +102,22 @@ const respond = /*#__PURE__*/Middleware__namespace.make(httpApp => Effect__names
     nodeResponse.end();
   }
 }))));
+
+/** @internal */
+const makeHandler = (httpApp, middleware) => {
+  const handledApp = middleware ? middleware(App__namespace.withDefaultMiddleware(respond(httpApp))) : App__namespace.withDefaultMiddleware(respond(httpApp));
+  return Effect__namespace.map(Effect__namespace.zip(Effect__namespace.runtime(), Effect__namespace.fiberId), ([runtime, fiberId]) => {
+    const runFork = Runtime__namespace.runFork(runtime);
+    return function handler(nodeRequest, nodeResponse) {
+      const fiber = runFork(Effect__namespace.provideService(handledApp, ServerRequest__namespace.ServerRequest, new ServerRequestImpl(nodeRequest, nodeResponse)));
+      nodeResponse.on("close", () => {
+        if (!nodeResponse.writableEnded) {
+          runFork(fiber.interruptAsFork(fiberId));
+        }
+      });
+    };
+  });
+};
 class ServerRequestImpl extends incomingMessage.IncomingMessageImpl {
   constructor(source, response, url = source.url, headersOverride, remoteAddressOverride) {
     super(source, _ => Error__namespace.RequestError({
@@ -182,10 +169,10 @@ class ServerRequestImpl extends incomingMessage.IncomingMessageImpl {
 }
 
 /** @internal */
-const layer$1 = (evaluate, options) => Layer__namespace.merge(Layer__namespace.scoped(Server__namespace.Server, make$1(evaluate, options)), platform.layer);
+const layer = (evaluate, options) => Layer__namespace.merge(Layer__namespace.scoped(Server__namespace.Server, make(evaluate, options)), platform.layer);
 
 /** @internal */
-const layerConfig$1 = (evaluate, options) => Layer__namespace.merge(Layer__namespace.scoped(Server__namespace.Server, Effect__namespace.flatMap(Effect__namespace.config(Config__namespace.unwrap(options)), options => make$1(evaluate, options))), platform.layer);
+const layerConfig = (evaluate, options) => Layer__namespace.merge(Layer__namespace.scoped(Server__namespace.Server, Effect__namespace.flatMap(Effect__namespace.config(Config__namespace.unwrap(options)), options => make(evaluate, options))), platform.layer);
 const handleResponse = (request, response) => Effect__namespace.suspend(() => {
   const nodeResponse = request.response;
   if (request.method === "HEAD") {
@@ -266,38 +253,11 @@ const handleResponse = (request, response) => Effect__namespace.suspend(() => {
   }
 });
 
-/**
- * @since 1.0.0
- *
- * Also includes exports from [`@effect/platform/Http/Server`](https://effect-ts.github.io/platform/platform/Http/Server.ts.html).
- */
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const make = make$1;
-
-/**
- * @since 1.0.0
- * @category layers
- */
-const layer = layer$1;
-
-/**
- * @since 1.0.0
- * @category layers
- */
-const layerConfig = layerConfig$1;
-
-var Server = /*#__PURE__*/_mergeNamespaces({
-  __proto__: null,
-  make: make,
-  layer: layer,
-  layerConfig: layerConfig
-}, [Server__namespace]);
+/** @internal */
+const requestSource = self => self.source;
 
-exports.Server = Server;
 exports.layer = layer;
 exports.layerConfig = layerConfig;
 exports.make = make;
+exports.makeHandler = makeHandler;
+exports.requestSource = requestSource;

package/dist/{Server-c9262046.esm.js → server-442c5e69.esm.js}

@@ -2,7 +2,7 @@ import * as FileSystem from '@effect/platform/FileSystem';
 import * as App from '@effect/platform/Http/App';
 import * as IncomingMessage from '@effect/platform/Http/IncomingMessage';
 import * as Middleware from '@effect/platform/Http/Middleware';
-import * as Server$1 from '@effect/platform/Http/Server';
+import * as Server from '@effect/platform/Http/Server';
 import * as Error from '@effect/platform/Http/ServerError';
 import * as ServerRequest from '@effect/platform/Http/ServerRequest';
 import * as Config from 'effect/Config';
@@ -17,25 +17,10 @@ import { pipeline } from 'node:stream/promises';
 import { fromWritable } from '../Sink/dist/effect-platform-node-Sink.esm.js';
 import { f as formData, s as stream } from './formData-a1c010f8.esm.js';
 import { I as IncomingMessageImpl } from './incomingMessage-5eb8c3fe.esm.js';
-import { l as layer$2 } from './platform-2c00c2c5.esm.js';
-
-function _mergeNamespaces(n, m) {
-  m.forEach(function (e) {
-    e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
-      if (k !== 'default' && !(k in n)) {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  });
-  return Object.freeze(n);
-}
+import { l as layer$1 } from './platform-2c00c2c5.esm.js';
 
 /** @internal */
-const make$1 = (evaluate, options) => Effect.gen(function* (_) {
+const make = (evaluate, options) => Effect.gen(function* (_) {
   const server = evaluate();
   const serverFiber = yield* _(Effect.addFinalizer(() => Effect.async(resume => {
     server.close(error => {
@@ -58,7 +43,7 @@ const make$1 = (evaluate, options) => Effect.gen(function* (_) {
     });
   }));
   const address = server.address();
-  return Server$1.make({
+  return Server.make({
     address: typeof address === "string" ? {
       _tag: "UnixAddress",
       path: address
@@ -67,24 +52,10 @@ const make$1 = (evaluate, options) => Effect.gen(function* (_) {
       hostname: address.address,
       port: address.port
     },
-    serve: (httpApp, middleware) => {
-      const handledApp = middleware ? middleware(App.withDefaultMiddleware(respond(httpApp))) : App.withDefaultMiddleware(respond(httpApp));
-      return Effect.flatMap(Effect.all([Effect.runtime(), Effect.fiberId]), ([runtime, fiberId]) => {
-        const runFork = Runtime.runFork(runtime);
-        function handler(nodeRequest, nodeResponse) {
-          const fiber = runFork(Effect.provideService(handledApp, ServerRequest.ServerRequest, new ServerRequestImpl(nodeRequest, nodeResponse)));
-          nodeResponse.on("close", () => {
-            if (!nodeResponse.writableEnded) {
-              runFork(fiber.interruptAsFork(fiberId));
-            }
-          });
-        }
-        return Effect.all([Effect.acquireRelease(Effect.sync(() => server.on("request", handler)), () => Effect.sync(() => server.off("request", handler))), Fiber.join(serverFiber)], {
-          discard: true,
-          concurrency: "unbounded"
-        });
-      });
-    }
+    serve: (httpApp, middleware) => Effect.flatMap(makeHandler(httpApp, middleware), handler => Effect.all([Effect.acquireRelease(Effect.sync(() => server.on("request", handler)), () => Effect.sync(() => server.off("request", handler))), Fiber.join(serverFiber)], {
+      discard: true,
+      concurrency: "unbounded"
+    }))
   });
 }).pipe(Effect.locally(IncomingMessage.maxBodySize, Option.some(FileSystem.Size(1024 * 1024 * 10))));
 const respond = /*#__PURE__*/Middleware.make(httpApp => Effect.flatMap(ServerRequest.ServerRequest, request => Effect.tapErrorCause(Effect.tap(Effect.flatMap(httpApp, response => Effect.flatMap(App.preResponseHandler, f => f(request, response))), response => handleResponse(request, response)), _cause => Effect.sync(() => {
@@ -96,6 +67,22 @@ const respond = /*#__PURE__*/Middleware.make(httpApp => Effect.flatMap(ServerReq
     nodeResponse.end();
   }
 }))));
+
+/** @internal */
+const makeHandler = (httpApp, middleware) => {
+  const handledApp = middleware ? middleware(App.withDefaultMiddleware(respond(httpApp))) : App.withDefaultMiddleware(respond(httpApp));
+  return Effect.map(Effect.zip(Effect.runtime(), Effect.fiberId), ([runtime, fiberId]) => {
+    const runFork = Runtime.runFork(runtime);
+    return function handler(nodeRequest, nodeResponse) {
+      const fiber = runFork(Effect.provideService(handledApp, ServerRequest.ServerRequest, new ServerRequestImpl(nodeRequest, nodeResponse)));
+      nodeResponse.on("close", () => {
+        if (!nodeResponse.writableEnded) {
+          runFork(fiber.interruptAsFork(fiberId));
+        }
+      });
+    };
+  });
+};
 class ServerRequestImpl extends IncomingMessageImpl {
   constructor(source, response, url = source.url, headersOverride, remoteAddressOverride) {
     super(source, _ => Error.RequestError({
@@ -147,10 +134,10 @@ class ServerRequestImpl extends IncomingMessageImpl {
 }
 
 /** @internal */
-const layer$1 = (evaluate, options) => Layer.merge(Layer.scoped(Server$1.Server, make$1(evaluate, options)), layer$2);
+const layer = (evaluate, options) => Layer.merge(Layer.scoped(Server.Server, make(evaluate, options)), layer$1);
 
 /** @internal */
-const layerConfig$1 = (evaluate, options) => Layer.merge(Layer.scoped(Server$1.Server, Effect.flatMap(Effect.config(Config.unwrap(options)), options => make$1(evaluate, options))), layer$2);
+const layerConfig = (evaluate, options) => Layer.merge(Layer.scoped(Server.Server, Effect.flatMap(Effect.config(Config.unwrap(options)), options => make(evaluate, options))), layer$1);
 const handleResponse = (request, response) => Effect.suspend(() => {
   const nodeResponse = request.response;
   if (request.method === "HEAD") {
@@ -231,35 +218,7 @@ const handleResponse = (request, response) => Effect.suspend(() => {
   }
 });
 
-/**
- * @since 1.0.0
- *
- * Also includes exports from [`@effect/platform/Http/Server`](https://effect-ts.github.io/platform/platform/Http/Server.ts.html).
- */
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const make = make$1;
-
-/**
- * @since 1.0.0
- * @category layers
- */
-const layer = layer$1;
-
-/**
- * @since 1.0.0
- * @category layers
- */
-const layerConfig = layerConfig$1;
-
-var Server = /*#__PURE__*/_mergeNamespaces({
-  __proto__: null,
-  make: make,
-  layer: layer,
-  layerConfig: layerConfig
-}, [Server$1]);
+/** @internal */
+const requestSource = self => self.source;
 
-export { Server as S, layerConfig as a, layer as l, make as m };
+export { makeHandler as a, layerConfig as b, layer as l, make as m, requestSource as r };

package/dist/{Server-7a3dbcbe.cjs.dev.js → server-b13861a8.cjs.dev.js}

@@ -4,7 +4,7 @@ var FileSystem = require('@effect/platform/FileSystem');
 var App = require('@effect/platform/Http/App');
 var IncomingMessage = require('@effect/platform/Http/IncomingMessage');
 var Middleware = require('@effect/platform/Http/Middleware');
-var Server$1 = require('@effect/platform/Http/Server');
+var Server = require('@effect/platform/Http/Server');
 var Error = require('@effect/platform/Http/ServerError');
 var ServerRequest = require('@effect/platform/Http/ServerRequest');
 var Config = require('effect/Config');
@@ -39,26 +39,11 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-function _mergeNamespaces(n, m) {
-  m.forEach(function (e) {
-    e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
-      if (k !== 'default' && !(k in n)) {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  });
-  return Object.freeze(n);
-}
-
 var FileSystem__namespace = /*#__PURE__*/_interopNamespace(FileSystem);
 var App__namespace = /*#__PURE__*/_interopNamespace(App);
 var IncomingMessage__namespace = /*#__PURE__*/_interopNamespace(IncomingMessage);
 var Middleware__namespace = /*#__PURE__*/_interopNamespace(Middleware);
-var Server__namespace = /*#__PURE__*/_interopNamespace(Server$1);
+var Server__namespace = /*#__PURE__*/_interopNamespace(Server);
 var Error__namespace = /*#__PURE__*/_interopNamespace(Error);
 var ServerRequest__namespace = /*#__PURE__*/_interopNamespace(ServerRequest);
 var Config__namespace = /*#__PURE__*/_interopNamespace(Config);
@@ -70,7 +55,7 @@ var Runtime__namespace = /*#__PURE__*/_interopNamespace(Runtime);
 var Stream__namespace = /*#__PURE__*/_interopNamespace(Stream);
 
 /** @internal */
-const make$1 = (evaluate, options) => Effect__namespace.gen(function* (_) {
+const make = (evaluate, options) => Effect__namespace.gen(function* (_) {
   const server = evaluate();
   const serverFiber = yield* _(Effect__namespace.addFinalizer(() => Effect__namespace.async(resume => {
     server.close(error => {
@@ -102,24 +87,10 @@ const make$1 = (evaluate, options) => Effect__namespace.gen(function* (_) {
       hostname: address.address,
       port: address.port
     },
-    serve: (httpApp, middleware) => {
-      const handledApp = middleware ? middleware(App__namespace.withDefaultMiddleware(respond(httpApp))) : App__namespace.withDefaultMiddleware(respond(httpApp));
-      return Effect__namespace.flatMap(Effect__namespace.all([Effect__namespace.runtime(), Effect__namespace.fiberId]), ([runtime, fiberId]) => {
-        const runFork = Runtime__namespace.runFork(runtime);
-        function handler(nodeRequest, nodeResponse) {
-          const fiber = runFork(Effect__namespace.provideService(handledApp, ServerRequest__namespace.ServerRequest, new ServerRequestImpl(nodeRequest, nodeResponse)));
-          nodeResponse.on("close", () => {
-            if (!nodeResponse.writableEnded) {
-              runFork(fiber.interruptAsFork(fiberId));
-            }
-          });
-        }
-        return Effect__namespace.all([Effect__namespace.acquireRelease(Effect__namespace.sync(() => server.on("request", handler)), () => Effect__namespace.sync(() => server.off("request", handler))), Fiber__namespace.join(serverFiber)], {
-          discard: true,
-          concurrency: "unbounded"
-        });
-      });
-    }
+    serve: (httpApp, middleware) => Effect__namespace.flatMap(makeHandler(httpApp, middleware), handler => Effect__namespace.all([Effect__namespace.acquireRelease(Effect__namespace.sync(() => server.on("request", handler)), () => Effect__namespace.sync(() => server.off("request", handler))), Fiber__namespace.join(serverFiber)], {
+      discard: true,
+      concurrency: "unbounded"
+    }))
   });
 }).pipe(Effect__namespace.locally(IncomingMessage__namespace.maxBodySize, Option__namespace.some(FileSystem__namespace.Size(1024 * 1024 * 10))));
 const respond = /*#__PURE__*/Middleware__namespace.make(httpApp => Effect__namespace.flatMap(ServerRequest__namespace.ServerRequest, request => Effect__namespace.tapErrorCause(Effect__namespace.tap(Effect__namespace.flatMap(httpApp, response => Effect__namespace.flatMap(App__namespace.preResponseHandler, f => f(request, response))), response => handleResponse(request, response)), _cause => Effect__namespace.sync(() => {
@@ -131,6 +102,22 @@ const respond = /*#__PURE__*/Middleware__namespace.make(httpApp => Effect__names
     nodeResponse.end();
   }
 }))));
+
+/** @internal */
+const makeHandler = (httpApp, middleware) => {
+  const handledApp = middleware ? middleware(App__namespace.withDefaultMiddleware(respond(httpApp))) : App__namespace.withDefaultMiddleware(respond(httpApp));
+  return Effect__namespace.map(Effect__namespace.zip(Effect__namespace.runtime(), Effect__namespace.fiberId), ([runtime, fiberId]) => {
+    const runFork = Runtime__namespace.runFork(runtime);
+    return function handler(nodeRequest, nodeResponse) {
+      const fiber = runFork(Effect__namespace.provideService(handledApp, ServerRequest__namespace.ServerRequest, new ServerRequestImpl(nodeRequest, nodeResponse)));
+      nodeResponse.on("close", () => {
+        if (!nodeResponse.writableEnded) {
+          runFork(fiber.interruptAsFork(fiberId));
+        }
+      });
+    };
+  });
+};
 class ServerRequestImpl extends incomingMessage.IncomingMessageImpl {
   constructor(source, response, url = source.url, headersOverride, remoteAddressOverride) {
     super(source, _ => Error__namespace.RequestError({
@@ -182,10 +169,10 @@ class ServerRequestImpl extends incomingMessage.IncomingMessageImpl {
 }
 
 /** @internal */
-const layer$1 = (evaluate, options) => Layer__namespace.merge(Layer__namespace.scoped(Server__namespace.Server, make$1(evaluate, options)), platform.layer);
+const layer = (evaluate, options) => Layer__namespace.merge(Layer__namespace.scoped(Server__namespace.Server, make(evaluate, options)), platform.layer);
 
 /** @internal */
-const layerConfig$1 = (evaluate, options) => Layer__namespace.merge(Layer__namespace.scoped(Server__namespace.Server, Effect__namespace.flatMap(Effect__namespace.config(Config__namespace.unwrap(options)), options => make$1(evaluate, options))), platform.layer);
+const layerConfig = (evaluate, options) => Layer__namespace.merge(Layer__namespace.scoped(Server__namespace.Server, Effect__namespace.flatMap(Effect__namespace.config(Config__namespace.unwrap(options)), options => make(evaluate, options))), platform.layer);
 const handleResponse = (request, response) => Effect__namespace.suspend(() => {
   const nodeResponse = request.response;
   if (request.method === "HEAD") {
@@ -266,38 +253,11 @@ const handleResponse = (request, response) => Effect__namespace.suspend(() => {
   }
 });
 
-/**
- * @since 1.0.0
- *
- * Also includes exports from [`@effect/platform/Http/Server`](https://effect-ts.github.io/platform/platform/Http/Server.ts.html).
- */
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const make = make$1;
-
-/**
- * @since 1.0.0
- * @category layers
- */
-const layer = layer$1;
-
-/**
- * @since 1.0.0
- * @category layers
- */
-const layerConfig = layerConfig$1;
-
-var Server = /*#__PURE__*/_mergeNamespaces({
-  __proto__: null,
-  make: make,
-  layer: layer,
-  layerConfig: layerConfig
-}, [Server__namespace]);
+/** @internal */
+const requestSource = self => self.source;
 
-exports.Server = Server;
 exports.layer = layer;
 exports.layerConfig = layerConfig;
 exports.make = make;
+exports.makeHandler = makeHandler;
+exports.requestSource = requestSource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/platform-node",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "description": "Unified interfaces for common platform-specific services",
   "main": "dist/effect-platform-node.cjs.js",
   "module": "dist/effect-platform-node.esm.js",
@@ -136,6 +136,12 @@
       "import": "./Http/Server/dist/effect-platform-node-Http-Server.cjs.mjs",
       "default": "./Http/Server/dist/effect-platform-node-Http-Server.cjs.js"
     },
+    "./Http/ServerRequest": {
+      "types": "./dist/declarations/src/Http/ServerRequest.d.ts",
+      "module": "./Http/ServerRequest/dist/effect-platform-node-Http-ServerRequest.esm.js",
+      "import": "./Http/ServerRequest/dist/effect-platform-node-Http-ServerRequest.cjs.mjs",
+      "default": "./Http/ServerRequest/dist/effect-platform-node-Http-ServerRequest.cjs.js"
+    },
     "./HttpClient": {
       "types": "./dist/declarations/src/HttpClient.d.ts",
       "module": "./HttpClient/dist/effect-platform-node-HttpClient.esm.js",