@effect/platform 0.48.26 → 0.48.28

package/src/Socket.ts

@@ -47,7 +47,10 @@ export interface Socket {
   readonly run: <R, E, _>(
     handler: (_: Uint8Array) => Effect.Effect<_, E, R>
   ) => Effect.Effect<void, SocketError | E, R>
-  readonly writer: Effect.Effect<(chunk: Uint8Array | CloseEvent) => Effect.Effect<void>, never, Scope.Scope>
+  readonly runRaw: <R, E, _>(
+    handler: (_: string | Uint8Array) => Effect.Effect<_, E, R>
+  ) => Effect.Effect<void, SocketError | E, R>
+  readonly writer: Effect.Effect<(chunk: Uint8Array | string | CloseEvent) => Effect.Effect<void>, never, Scope.Scope>
 }
 
 /**
@@ -165,7 +168,7 @@ export const toChannel = <IE>(
   self: Socket
 ): Channel.Channel<
   Chunk.Chunk<Uint8Array>,
-  Chunk.Chunk<Uint8Array | CloseEvent>,
+  Chunk.Chunk<Uint8Array | string | CloseEvent>,
   SocketError | IE,
   IE,
   void,
@@ -177,7 +180,7 @@ export const toChannel = <IE>(
       const write = yield* _(Scope.extend(self.writer, writeScope))
       const exitQueue = yield* _(Queue.unbounded<Exit.Exit<Chunk.Chunk<Uint8Array>, SocketError | IE>>())
 
-      const input: AsyncProducer.AsyncInputProducer<IE, Chunk.Chunk<Uint8Array | CloseEvent>, unknown> = {
+      const input: AsyncProducer.AsyncInputProducer<IE, Chunk.Chunk<Uint8Array | string | CloseEvent>, unknown> = {
         awaitRead: () => Effect.unit,
         emit(chunk) {
           return Effect.catchAllCause(
@@ -227,7 +230,7 @@ export const toChannelWith = <IE = never>() =>
   self: Socket
 ): Channel.Channel<
   Chunk.Chunk<Uint8Array>,
-  Chunk.Chunk<Uint8Array | CloseEvent>,
+  Chunk.Chunk<Uint8Array | string | CloseEvent>,
   SocketError | IE,
   IE,
   void,
@@ -240,7 +243,7 @@ export const toChannelWith = <IE = never>() =>
  */
 export const makeChannel = <IE = never>(): Channel.Channel<
   Chunk.Chunk<Uint8Array>,
-  Chunk.Chunk<Uint8Array | CloseEvent>,
+  Chunk.Chunk<Uint8Array | string | CloseEvent>,
   SocketError | IE,
   IE,
   void,
@@ -303,12 +306,11 @@ export const fromWebSocket = (
 ): Effect.Effect<Socket> =>
   Effect.gen(function*(_) {
     const closeCodeIsError = options?.closeCodeIsError ?? defaultCloseCodeIsError
-    const sendQueue = yield* _(Queue.unbounded<Uint8Array | CloseEvent>())
+    const sendQueue = yield* _(Queue.unbounded<Uint8Array | string | CloseEvent>())
 
-    const run = <R, E, _>(handler: (_: Uint8Array) => Effect.Effect<_, E, R>) =>
+    const runRaw = <R, E, _>(handler: (_: string | Uint8Array) => Effect.Effect<_, E, R>) =>
       Effect.gen(function*(_) {
         const ws = yield* _(acquire)
-        const encoder = new TextEncoder()
         const fiberSet = yield* _(FiberSet.make<any, E | SocketError>())
         const run = yield* _(
           FiberSet.runtime(fiberSet)<R>(),
@@ -317,15 +319,13 @@ export const fromWebSocket = (
         let open = false
 
         ws.onmessage = (event) => {
-          run(
-            handler(
-              event.data instanceof Uint8Array
-                ? event.data
-                : typeof event.data === "string"
-                ? encoder.encode(event.data)
-                : new Uint8Array(event.data)
-            )
-          )
+          run(handler(
+            typeof event.data === "string"
+              ? event.data
+              : event.data instanceof Uint8Array
+              ? event.data
+              : new Uint8Array(event.data)
+          ))
         }
         ws.onclose = (event) => {
           Deferred.unsafeDone(
@@ -396,12 +396,21 @@ export const fromWebSocket = (
         Effect.interruptible
       )
 
-    const write = (chunk: Uint8Array | CloseEvent) => Queue.offer(sendQueue, chunk)
+    const encoder = new TextEncoder()
+    const run = <R, E, _>(handler: (_: Uint8Array) => Effect.Effect<_, E, R>) =>
+      runRaw((data) =>
+        typeof data === "string"
+          ? handler(encoder.encode(data))
+          : handler(data)
+      )
+
+    const write = (chunk: Uint8Array | string | CloseEvent) => Queue.offer(sendQueue, chunk)
     const writer = Effect.succeed(write)
 
     return Socket.of({
       [TypeId]: TypeId,
       run,
+      runRaw,
       writer
     })
   })
@@ -417,7 +426,7 @@ export const makeWebSocketChannel = <IE = never>(
   }
 ): Channel.Channel<
   Chunk.Chunk<Uint8Array>,
-  Chunk.Chunk<Uint8Array | CloseEvent>,
+  Chunk.Chunk<Uint8Array | string | CloseEvent>,
   SocketError | IE,
   IE,
   void,

package/src/Transferable.ts

@@ -93,8 +93,7 @@ export const schema: {
   Schema.transformOrFail(
     Schema.encodedSchema(self),
     self,
-    ParseResult.succeed,
-    (i) => Effect.as(addAll(f(i)), i)
+    { decode: ParseResult.succeed, encode: (i) => Effect.as(addAll(f(i)), i) }
   ))
 
 /**
@@ -102,7 +101,7 @@ export const schema: {
  * @category schema
  */
 export const ImageData: Schema.Schema<ImageData> = schema(
-  Schema.any,
+  Schema.Any,
   (_) => [(_ as ImageData).data.buffer]
 )
 
@@ -111,7 +110,7 @@ export const ImageData: Schema.Schema<ImageData> = schema(
  * @category schema
  */
 export const MessagePort: Schema.Schema<MessagePort> = schema(
-  Schema.any,
+  Schema.Any,
   (_) => [_ as MessagePort]
 )
 

package/src/WorkerError.ts

@@ -26,14 +26,16 @@ export type WorkerErrorTypeId = typeof WorkerErrorTypeId
 export const isWorkerError = (u: unknown): u is WorkerError => Predicate.hasProperty(u, WorkerErrorTypeId)
 
 const causeDefectPretty: Schema.Schema<unknown> = Schema.transform(
-  Schema.unknown,
-  Schema.unknown,
-  identity,
-  (defect) => {
-    if (Predicate.isObject(defect)) {
-      return Cause.pretty(Cause.die(defect))
+  Schema.Unknown,
+  Schema.Unknown,
+  {
+    decode: identity,
+    encode: (defect) => {
+      if (Predicate.isObject(defect)) {
+        return Cause.pretty(Cause.die(defect))
+      }
+      return String(defect)
     }
-    return String(defect)
   }
 )
 
@@ -42,7 +44,7 @@ const causeDefectPretty: Schema.Schema<unknown> = Schema.transform(
  * @category errors
  */
 export class WorkerError extends Schema.TaggedError<WorkerError>()("WorkerError", {
-  reason: Schema.literal("spawn", "decode", "send", "unknown", "encode"),
+  reason: Schema.Literal("spawn", "decode", "send", "unknown", "encode"),
   error: causeDefectPretty
 }) {
   /**
@@ -56,7 +58,7 @@ export class WorkerError extends Schema.TaggedError<WorkerError>()("WorkerError"
   static readonly Cause: Schema.Schema<
     Cause.Cause<WorkerError>,
     Schema.CauseEncoded<WorkerErrorFrom>
-  > = Schema.cause({ defect: causeDefectPretty, error: this })
+  > = Schema.Cause({ defect: causeDefectPretty, error: this })
 
   /**
    * @since 1.0.0

package/src/internal/http/middleware.ts

@@ -78,18 +78,18 @@ export const logger = make((httpApp) => {
 })
 
 /** @internal */
-export const tracer = make((httpApp) => {
-  const appWithStatus = Effect.tap(
-    httpApp,
-    (response) => Effect.annotateCurrentSpan("http.status", response.status)
-  )
-  return Effect.withFiberRuntime((fiber) => {
+export const tracer = make((httpApp) =>
+  Effect.withFiberRuntime((fiber) => {
     const context = fiber.getFiberRef(FiberRef.currentContext)
     const request = Context.unsafeGet(context, ServerRequest.ServerRequest)
     const disabled = fiber.getFiberRef(currentTracerDisabledWhen)(request)
     if (disabled) {
       return httpApp
     }
+    const appWithStatus = Effect.tap(
+      httpApp,
+      (response) => Effect.annotateCurrentSpan("http.status", response.status)
+    )
     return Effect.withSpan(
       appWithStatus,
       `http.server ${request.method}`,
@@ -99,7 +99,7 @@ export const tracer = make((httpApp) => {
       }
     )
   })
-})
+)
 
 /** @internal */
 export const xForwardedHeaders = make((httpApp) =>

package/src/internal/http/multipart.ts

@@ -105,7 +105,7 @@ const fileSchema: Schema.Schema<Multipart.PersistedFile> = Schema.declare(isPers
 })
 
 /** @internal */
-export const filesSchema: Schema.Schema<ReadonlyArray<Multipart.PersistedFile>> = Schema.array(fileSchema)
+export const filesSchema: Schema.Schema<ReadonlyArray<Multipart.PersistedFile>> = Schema.Array(fileSchema)
 
 /** @internal */
 export const schemaPersisted = <R, I extends Partial<Multipart.Persisted>, A>(
@@ -140,7 +140,7 @@ export const schemaJson = <A, I, R>(schema: Schema.Schema<A, I, R>, options?: Pa
   >(2, (persisted, field) =>
     Effect.map(
       Schema.decodeUnknown(
-        Schema.struct({
+        Schema.Struct({
           [field]: fromJson
         }),
         options

package/src/internal/http/router.ts

@@ -5,6 +5,7 @@ import * as Chunk from "effect/Chunk"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Effectable from "effect/Effectable"
+import * as FiberRef from "effect/FiberRef"
 import { dual } from "effect/Function"
 import * as Inspectable from "effect/Inspectable"
 import * as Option from "effect/Option"
@@ -202,50 +203,48 @@ const toHttpApp = <R, E>(
       router.on(route.method, route.path, route)
     }
   })
-  return Effect.flatMap(
-    ServerRequest.ServerRequest,
-    (request): App.Default<R, E | Error.RouteNotFound> => {
-      if (mountsLen > 0) {
-        for (let i = 0; i < mountsLen; i++) {
-          const [path, context, options] = mounts[i]
-          if (request.url.startsWith(path)) {
-            return Effect.provideService(
-              Effect.provideService(
-                context.route.handler as App.Default<R, E>,
-                RouteContext,
-                context
-              ),
-              ServerRequest.ServerRequest,
-              options?.includePrefix ?
-                request :
-                sliceRequestUrl(request, path)
-            )
+  return Effect.withFiberRuntime<
+    ServerResponse.ServerResponse,
+    E | Error.RouteNotFound,
+    R | ServerRequest.ServerRequest
+  >((fiber) => {
+    let context = fiber.getFiberRef(FiberRef.currentContext)
+    const request = Context.unsafeGet(context, ServerRequest.ServerRequest)
+    if (mountsLen > 0) {
+      for (let i = 0; i < mountsLen; i++) {
+        const [path, routeContext, options] = mounts[i]
+        if (request.url.startsWith(path)) {
+          context = Context.add(context, RouteContext, routeContext)
+          if (options?.includePrefix !== true) {
+            context = Context.add(context, ServerRequest.ServerRequest, sliceRequestUrl(request, path))
           }
+          return Effect.locally(
+            routeContext.route.handler as App.Default<R, E>,
+            FiberRef.currentContext,
+            context
+          )
         }
       }
+    }
 
-      let result = router.find(request.method, request.url)
-      if (result === undefined && request.method === "HEAD") {
-        result = router.find("GET", request.url)
-      }
-      if (result === undefined) {
-        return Effect.fail(new Error.RouteNotFound({ request }))
-      }
-      const route = result.handler
-      if (route.prefix._tag === "Some") {
-        request = sliceRequestUrl(request, route.prefix.value)
-      }
-      return Effect.mapInputContext(
-        route.handler as Effect.Effect<ServerResponse.ServerResponse, E, Router.Router.ExcludeProvided<R>>,
-        (context) =>
-          Context.add(
-            Context.add(context, ServerRequest.ServerRequest, request),
-            RouteContext,
-            new RouteContextImpl(route, result!.params, result!.searchParams)
-          ) as Context.Context<R>
-      )
+    let result = router.find(request.method, request.url)
+    if (result === undefined && request.method === "HEAD") {
+      result = router.find("GET", request.url)
     }
-  )
+    if (result === undefined) {
+      return Effect.fail(new Error.RouteNotFound({ request }))
+    }
+    const route = result.handler
+    if (route.prefix._tag === "Some") {
+      context = Context.add(context, ServerRequest.ServerRequest, sliceRequestUrl(request, route.prefix.value))
+    }
+    context = Context.add(context, RouteContext, new RouteContextImpl(route, result.params, result.searchParams))
+    return Effect.locally(
+      route.handler as Effect.Effect<ServerResponse.ServerResponse, E, Router.Router.ExcludeProvided<R>>,
+      FiberRef.currentContext,
+      context
+    )
+  })
 }
 
 function sliceRequestUrl(request: ServerRequest.ServerRequest, prefix: string) {
@@ -600,3 +599,10 @@ export const provideServiceEffect = dual<
   >,
   E | E1
 > => use(self, Effect.provideServiceEffect(tag, effect)) as any)
+
+/* @internal */
+export const uninterruptible = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+  Effect.uninterruptible(Effect.flatMap(
+    effect,
+    Effect.die
+  ))