@effect/platform-node 0.45.31 → 0.46.1

package/src/internal/http/server.ts

@@ -21,7 +21,7 @@ import * as FiberSet from "effect/FiberSet"
 import { type LazyArg } from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
-import type { ReadonlyRecord } from "effect/ReadonlyRecord"
+import type { ReadonlyRecord } from "effect/Record"
 import * as Scope from "effect/Scope"
 import * as Stream from "effect/Stream"
 import * as Http from "node:http"
@@ -51,7 +51,7 @@ export const make = (
             if (error) {
               resume(Effect.die(error))
             } else {
-              resume(Effect.unit)
+              resume(Effect.void)
             }
           })
         })
@@ -62,7 +62,7 @@ export const make = (
         resume(Effect.fail(new Error.ServeError({ error })))
       })
       server.listen(options, () => {
-        resume(Effect.unit)
+        resume(Effect.void)
       })
     }))
 
@@ -73,7 +73,7 @@ export const make = (
         Effect.sync(() => new WS.WebSocketServer({ noServer: true })),
         (wss) =>
           Effect.async<void>((resume) => {
-            wss.close(() => resume(Effect.unit))
+            wss.close(() => resume(Effect.void))
           })
       ),
       Scope.extend(scope),
@@ -114,20 +114,20 @@ export const make = (
 
 /** @internal */
 export const makeHandler: {
-  <R, E>(httpApp: App.Default<R, E>): Effect.Effect<
+  <R, E>(httpApp: App.Default<E, R>): Effect.Effect<
     (nodeRequest: Http.IncomingMessage, nodeResponse: Http.ServerResponse) => void,
     never,
     Exclude<R, ServerRequest.ServerRequest | Scope.Scope>
   >
   <R, E, App extends App.Default<any, any>>(
-    httpApp: App.Default<R, E>,
-    middleware: Middleware.Middleware.Applied<R, E, App>
+    httpApp: App.Default<E, R>,
+    middleware: Middleware.Middleware.Applied<App, E, R>
   ): Effect.Effect<
     (nodeRequest: Http.IncomingMessage, nodeResponse: Http.ServerResponse) => void,
     never,
     Exclude<Effect.Effect.Context<App>, ServerRequest.ServerRequest | Scope.Scope>
   >
-} = <R, E>(httpApp: App.Default<R, E>, middleware?: Middleware.Middleware) => {
+} = <E, R>(httpApp: App.Default<E, R>, middleware?: Middleware.Middleware) => {
   const handledApp = App.toHandled(httpApp, (request, exit) => {
     if (exit._tag === "Success") {
       return Effect.catchAllCause(
@@ -164,7 +164,7 @@ export const makeHandler: {
 /** @internal */
 export const makeUpgradeHandler = <R, E>(
   lazyWss: Effect.Effect<WS.WebSocketServer>,
-  httpApp: App.Default<R, E>,
+  httpApp: App.Default<E, R>,
   middleware?: Middleware.Middleware
 ) => {
   const handledApp = App.toHandled(httpApp, (request, exit) => {
@@ -380,7 +380,7 @@ const handleResponse = (request: ServerRequest.ServerRequest, response: ServerRe
   Effect.suspend((): Effect.Effect<void, Error.ResponseError> => {
     const nodeResponse = (request as ServerRequestImpl).resolvedResponse
     if (nodeResponse.writableEnded) {
-      return Effect.unit
+      return Effect.void
     }
 
     let headers: Record<string, string | Array<string>> = response.headers
@@ -396,14 +396,14 @@ const handleResponse = (request: ServerRequest.ServerRequest, response: ServerRe
     if (request.method === "HEAD") {
       nodeResponse.writeHead(response.status, headers)
       nodeResponse.end()
-      return Effect.unit
+      return Effect.void
     }
     const body = response.body
     switch (body._tag) {
       case "Empty": {
         nodeResponse.writeHead(response.status, headers)
         nodeResponse.end()
-        return Effect.unit
+        return Effect.void
       }
       case "Raw": {
         nodeResponse.writeHead(response.status, headers)
@@ -423,12 +423,12 @@ const handleResponse = (request: ServerRequest.ServerRequest, response: ServerRe
           })
         }
         nodeResponse.end(body.body)
-        return Effect.unit
+        return Effect.void
       }
       case "Uint8Array": {
         nodeResponse.writeHead(response.status, headers)
         nodeResponse.end(body.body)
-        return Effect.unit
+        return Effect.void
       }
       case "FormData": {
         return Effect.async<void, Error.ResponseError>((resume) => {
@@ -450,7 +450,7 @@ const handleResponse = (request: ServerRequest.ServerRequest, response: ServerRe
               ))
             })
             .once("finish", () => {
-              resume(Effect.unit)
+              resume(Effect.void)
             })
         })
       }

package/src/internal/worker.ts

@@ -15,7 +15,7 @@ const platformWorkerImpl = Worker.PlatformWorker.of({
         pipe(
           Effect.async<void>((resume) => {
             worker.once("exit", () => {
-              resume(Effect.unit)
+              resume(Effect.void)
             })
             worker.postMessage([1])
           }),

package/src/internal/workerRunner.ts

@@ -15,12 +15,12 @@ const platformRunnerImpl = Runner.PlatformRunner.of({
         return yield* _(new WorkerError({ reason: "spawn", error: new Error("not in worker") }))
       }
       const port = WorkerThreads.parentPort
-      const queue = yield* _(Queue.unbounded<I>())
+      const queue = yield* _(Queue.unbounded<readonly [portId: number, message: I]>())
       yield* _(
         Effect.async<never, WorkerError>((resume) => {
           port.on("message", (message: Runner.BackingRunner.Message<I>) => {
             if (message[0] === 0) {
-              queue.unsafeOffer(message[1])
+              queue.unsafeOffer([0, message[1]])
             } else {
               Effect.runFork(shutdown)
             }
@@ -32,7 +32,7 @@ const platformRunnerImpl = Runner.PlatformRunner.of({
             resume(new WorkerError({ reason: "unknown", error }))
           })
         }),
-        Effect.tapErrorCause((cause) => Cause.isInterruptedOnly(cause) ? Effect.unit : Effect.logDebug(cause)),
+        Effect.tapErrorCause((cause) => Cause.isInterruptedOnly(cause) ? Effect.void : Effect.logDebug(cause)),
         Effect.retry(Schedule.forever),
         Effect.annotateLogs({
           package: "@effect/platform-node",
@@ -41,7 +41,7 @@ const platformRunnerImpl = Runner.PlatformRunner.of({
         Effect.interruptible,
         Effect.forkScoped
       )
-      const send = (message: O, transfers?: ReadonlyArray<unknown>) =>
+      const send = (_portId: number, message: O, transfers?: ReadonlyArray<unknown>) =>
         Effect.sync(() => port.postMessage([1, message], transfers as any))
       // ready
       port.postMessage([0])