@effect/platform 0.22.1 → 0.23.1

package/dist/{middleware-98794cc2.cjs.dev.js → middleware-5fc689fd.cjs.dev.js}

@@ -1,9 +1,11 @@
 'use strict';
 
 var Effect = require('effect/Effect');
+var FiberRef = require('effect/FiberRef');
+var Global = require('effect/GlobalValue');
 var Http_Headers_dist_effectPlatformHttpHeaders = require('./Headers-f56bc667.cjs.dev.js');
 var Http_IncomingMessage_dist_effectPlatformHttpIncomingMessage = require('../Http/IncomingMessage/dist/effect-platform-Http-IncomingMessage.cjs.dev.js');
-var Http_ServerRequest_dist_effectPlatformHttpServerRequest = require('./ServerRequest-8e9629a5.cjs.dev.js');
+var Http_ServerRequest_dist_effectPlatformHttpServerRequest = require('./ServerRequest-c5471023.cjs.dev.js');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -24,21 +26,33 @@ function _interopNamespace(e) {
 }
 
 var Effect__namespace = /*#__PURE__*/_interopNamespace(Effect);
+var FiberRef__namespace = /*#__PURE__*/_interopNamespace(FiberRef);
 
 /** @internal */
 const make = middleware => middleware;
 
+/** @internal */
+const loggerDisabled = /*#__PURE__*/Global.globalValue( /*#__PURE__*/Symbol.for("@effect/platform/Http/Middleware/loggerDisabled"), () => FiberRef__namespace.unsafeMake(false));
+
+/** @internal */
+const withLoggerDisabled = self => Effect__namespace.zipRight(FiberRef__namespace.set(loggerDisabled, true), self);
+
 /** @internal */
 const logger = /*#__PURE__*/make(httpApp => {
   let counter = 0;
-  return Effect__namespace.flatMap(Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest, request => Effect__namespace.withLogSpan(Effect__namespace.onExit(httpApp, exit => exit._tag === "Failure" ? Effect__namespace.annotateLogs(Effect__namespace.log(exit.cause), {
-    "http.method": request.method,
-    "http.url": request.url,
-    "http.status": 500
-  }) : Effect__namespace.annotateLogs(Effect__namespace.log(""), {
-    "http.method": request.method,
-    "http.url": request.url,
-    "http.status": exit.value.status
+  return Effect__namespace.flatMap(Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest, request => Effect__namespace.withLogSpan(Effect__namespace.onExit(httpApp, exit => Effect__namespace.flatMap(FiberRef__namespace.get(loggerDisabled), disabled => {
+    if (disabled) {
+      return Effect__namespace.unit;
+    }
+    return exit._tag === "Failure" ? Effect__namespace.annotateLogs(Effect__namespace.log(exit.cause), {
+      "http.method": request.method,
+      "http.url": request.url,
+      "http.status": 500
+    }) : Effect__namespace.annotateLogs(Effect__namespace.log(""), {
+      "http.method": request.method,
+      "http.url": request.url,
+      "http.status": exit.value.status
+    });
   })), `http.span.${++counter}`));
 });
 
@@ -61,6 +75,8 @@ const xForwardedHeaders = /*#__PURE__*/make(httpApp => Effect__namespace.updateS
 }) : request));
 
 exports.logger = logger;
+exports.loggerDisabled = loggerDisabled;
 exports.make = make;
 exports.tracer = tracer;
+exports.withLoggerDisabled = withLoggerDisabled;
 exports.xForwardedHeaders = xForwardedHeaders;

package/dist/{middleware-85768a1e.cjs.prod.js → middleware-aa67276a.cjs.prod.js}

@@ -1,9 +1,11 @@
 'use strict';
 
 var Effect = require('effect/Effect');
+var FiberRef = require('effect/FiberRef');
+var Global = require('effect/GlobalValue');
 var Http_Headers_dist_effectPlatformHttpHeaders = require('./Headers-122cb877.cjs.prod.js');
 var Http_IncomingMessage_dist_effectPlatformHttpIncomingMessage = require('../Http/IncomingMessage/dist/effect-platform-Http-IncomingMessage.cjs.prod.js');
-var Http_ServerRequest_dist_effectPlatformHttpServerRequest = require('./ServerRequest-705b12bb.cjs.prod.js');
+var Http_ServerRequest_dist_effectPlatformHttpServerRequest = require('./ServerRequest-bea4cd33.cjs.prod.js');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -24,21 +26,33 @@ function _interopNamespace(e) {
 }
 
 var Effect__namespace = /*#__PURE__*/_interopNamespace(Effect);
+var FiberRef__namespace = /*#__PURE__*/_interopNamespace(FiberRef);
 
 /** @internal */
 const make = middleware => middleware;
 
+/** @internal */
+const loggerDisabled = /*#__PURE__*/Global.globalValue( /*#__PURE__*/Symbol.for("@effect/platform/Http/Middleware/loggerDisabled"), () => FiberRef__namespace.unsafeMake(false));
+
+/** @internal */
+const withLoggerDisabled = self => Effect__namespace.zipRight(FiberRef__namespace.set(loggerDisabled, true), self);
+
 /** @internal */
 const logger = /*#__PURE__*/make(httpApp => {
   let counter = 0;
-  return Effect__namespace.flatMap(Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest, request => Effect__namespace.withLogSpan(Effect__namespace.onExit(httpApp, exit => exit._tag === "Failure" ? Effect__namespace.annotateLogs(Effect__namespace.log(exit.cause), {
-    "http.method": request.method,
-    "http.url": request.url,
-    "http.status": 500
-  }) : Effect__namespace.annotateLogs(Effect__namespace.log(""), {
-    "http.method": request.method,
-    "http.url": request.url,
-    "http.status": exit.value.status
+  return Effect__namespace.flatMap(Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest, request => Effect__namespace.withLogSpan(Effect__namespace.onExit(httpApp, exit => Effect__namespace.flatMap(FiberRef__namespace.get(loggerDisabled), disabled => {
+    if (disabled) {
+      return Effect__namespace.unit;
+    }
+    return exit._tag === "Failure" ? Effect__namespace.annotateLogs(Effect__namespace.log(exit.cause), {
+      "http.method": request.method,
+      "http.url": request.url,
+      "http.status": 500
+    }) : Effect__namespace.annotateLogs(Effect__namespace.log(""), {
+      "http.method": request.method,
+      "http.url": request.url,
+      "http.status": exit.value.status
+    });
   })), `http.span.${++counter}`));
 });
 
@@ -61,6 +75,8 @@ const xForwardedHeaders = /*#__PURE__*/make(httpApp => Effect__namespace.updateS
 }) : request));
 
 exports.logger = logger;
+exports.loggerDisabled = loggerDisabled;
 exports.make = make;
 exports.tracer = tracer;
+exports.withLoggerDisabled = withLoggerDisabled;
 exports.xForwardedHeaders = xForwardedHeaders;

package/dist/{middleware-ea618e68.esm.js → middleware-f2836150.esm.js}

@@ -1,22 +1,35 @@
 import * as Effect from 'effect/Effect';
+import * as FiberRef from 'effect/FiberRef';
+import { globalValue } from 'effect/GlobalValue';
 import { s as set } from './Headers-58b56a08.esm.js';
 import { schemaExternalSpan } from '../Http/IncomingMessage/dist/effect-platform-Http-IncomingMessage.esm.js';
-import { S as ServerRequest } from './ServerRequest-078a4bb2.esm.js';
+import { S as ServerRequest } from './ServerRequest-818d861a.esm.js';
 
 /** @internal */
 const make = middleware => middleware;
 
+/** @internal */
+const loggerDisabled = /*#__PURE__*/globalValue( /*#__PURE__*/Symbol.for("@effect/platform/Http/Middleware/loggerDisabled"), () => FiberRef.unsafeMake(false));
+
+/** @internal */
+const withLoggerDisabled = self => Effect.zipRight(FiberRef.set(loggerDisabled, true), self);
+
 /** @internal */
 const logger = /*#__PURE__*/make(httpApp => {
   let counter = 0;
-  return Effect.flatMap(ServerRequest, request => Effect.withLogSpan(Effect.onExit(httpApp, exit => exit._tag === "Failure" ? Effect.annotateLogs(Effect.log(exit.cause), {
-    "http.method": request.method,
-    "http.url": request.url,
-    "http.status": 500
-  }) : Effect.annotateLogs(Effect.log(""), {
-    "http.method": request.method,
-    "http.url": request.url,
-    "http.status": exit.value.status
+  return Effect.flatMap(ServerRequest, request => Effect.withLogSpan(Effect.onExit(httpApp, exit => Effect.flatMap(FiberRef.get(loggerDisabled), disabled => {
+    if (disabled) {
+      return Effect.unit;
+    }
+    return exit._tag === "Failure" ? Effect.annotateLogs(Effect.log(exit.cause), {
+      "http.method": request.method,
+      "http.url": request.url,
+      "http.status": 500
+    }) : Effect.annotateLogs(Effect.log(""), {
+      "http.method": request.method,
+      "http.url": request.url,
+      "http.status": exit.value.status
+    });
   })), `http.span.${++counter}`));
 });
 
@@ -38,4 +51,4 @@ const xForwardedHeaders = /*#__PURE__*/make(httpApp => Effect.updateService(http
   remoteAddress: request.headers["x-forwarded-for"]?.split(",")[0].trim()
 }) : request));
 
-export { logger as l, make as m, tracer as t, xForwardedHeaders as x };
+export { loggerDisabled as a, logger as l, make as m, tracer as t, withLoggerDisabled as w, xForwardedHeaders as x };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/platform",
-  "version": "0.22.1",
+  "version": "0.23.1",
   "description": "Unified interfaces for common platform-specific services",
   "main": "dist/effect-platform.cjs.js",
   "module": "dist/effect-platform.esm.js",
@@ -34,13 +34,13 @@
     "path-browserify": "^1.0.1"
   },
   "devDependencies": {
-    "@effect/schema": "^0.43.2",
+    "@effect/schema": "^0.44.0",
     "@types/path-browserify": "^1.0.0",
-    "effect": "2.0.0-next.48"
+    "effect": "2.0.0-next.49"
   },
   "peerDependencies": {
-    "@effect/schema": "^0.43.0",
-    "effect": "2.0.0-next.48"
+    "@effect/schema": "^0.44.0",
+    "effect": "2.0.0-next.49"
   },
   "files": [
     "src",

package/src/Http/Middleware.ts

@@ -1,6 +1,8 @@
 /**
  * @since 1.0.0
  */
+import type * as Effect from "effect/Effect"
+import type * as FiberRef from "effect/FiberRef"
 import * as internal from "../internal/http/middleware"
 import type * as App from "./App"
 
@@ -36,6 +38,19 @@ export const make: <M extends Middleware>(middleware: M) => M = internal.make
  */
 export const logger: <R, E>(httpApp: App.Default<R, E>) => App.Default<R, E> = internal.logger
 
+/**
+ * @since 1.0.0
+ * @category fiber refs
+ */
+export const loggerDisabled: FiberRef.FiberRef<boolean> = internal.loggerDisabled
+
+/**
+ * @since 1.0.0
+ * @category fiber refs
+ */
+export const withLoggerDisabled: <R, E, A>(self: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A> =
+  internal.withLoggerDisabled
+
 /**
  * @since 1.0.0
  * @category constructors

package/src/internal/fileSystem.ts

@@ -1,3 +1,5 @@
+import * as Channel from "effect/Channel"
+import * as Chunk from "effect/Chunk"
 import { Tag } from "effect/Context"
 import * as Effect from "effect/Effect"
 import { identity, pipe } from "effect/Function"
@@ -86,27 +88,39 @@ export const make = (
 
 /** @internal */
 const stream = (file: File, {
-  bufferSize = 4,
+  bufferSize = 16,
   bytesToRead: bytesToRead_,
   chunkSize: chunkSize_ = Size(64 * 1024)
 }: StreamOptions = {}) => {
   const bytesToRead = bytesToRead_ !== undefined ? Size(bytesToRead_) : undefined
   const chunkSize = Size(chunkSize_)
-  return Stream.bufferChunks(
-    Stream.unfoldEffect(BigInt(0), (totalBytesRead) => {
-      if (bytesToRead !== undefined && bytesToRead <= totalBytesRead) {
-        return Effect.succeed(Option.none())
-      }
 
-      const toRead = bytesToRead !== undefined && (bytesToRead - totalBytesRead) < chunkSize
-        ? bytesToRead - totalBytesRead
-        : chunkSize
+  function loop(
+    totalBytesRead: bigint
+  ): Channel.Channel<never, unknown, unknown, unknown, Error.PlatformError, Chunk.Chunk<Uint8Array>, void> {
+    if (bytesToRead !== undefined && bytesToRead <= totalBytesRead) {
+      return Channel.unit
+    }
 
-      return Effect.map(
-        file.readAlloc(toRead),
-        Option.map((buf) => [buf, Size(totalBytesRead + BigInt(buf.length))] as const)
-      )
-    }),
+    const toRead = bytesToRead !== undefined && (bytesToRead - totalBytesRead) < chunkSize
+      ? bytesToRead - totalBytesRead
+      : chunkSize
+
+    return Channel.flatMap(
+      file.readAlloc(toRead),
+      Option.match({
+        onNone: () => Channel.unit,
+        onSome: (buf) =>
+          Channel.flatMap(
+            Channel.write(Chunk.of(buf)),
+            (_) => loop(totalBytesRead + BigInt(buf.length))
+          )
+      })
+    )
+  }
+
+  return Stream.bufferChunks(
+    Stream.fromChannel(loop(BigInt(0))),
     { capacity: bufferSize }
   )
 }

package/src/internal/http/middleware.ts

@@ -1,4 +1,6 @@
 import * as Effect from "effect/Effect"
+import * as FiberRef from "effect/FiberRef"
+import { globalValue } from "effect/GlobalValue"
 import * as Headers from "../../Http/Headers"
 import * as IncomingMessage from "../../Http/IncomingMessage"
 import type * as Middleware from "../../Http/Middleware"
@@ -7,6 +9,19 @@ import * as ServerRequest from "../../Http/ServerRequest"
 /** @internal */
 export const make = <M extends Middleware.Middleware>(middleware: M): M => middleware
 
+/** @internal */
+export const loggerDisabled = globalValue(
+  Symbol.for("@effect/platform/Http/Middleware/loggerDisabled"),
+  () => FiberRef.unsafeMake(false)
+)
+
+/** @internal */
+export const withLoggerDisabled = <R, E, A>(self: Effect.Effect<R, E, A>): Effect.Effect<R, E, A> =>
+  Effect.zipRight(
+    FiberRef.set(loggerDisabled, true),
+    self
+  )
+
 /** @internal */
 export const logger = make((httpApp) => {
   let counter = 0
@@ -15,17 +30,25 @@ export const logger = make((httpApp) => {
     (request) =>
       Effect.withLogSpan(
         Effect.onExit(httpApp, (exit) =>
-          exit._tag === "Failure" ?
-            Effect.annotateLogs(Effect.log(exit.cause), {
-              "http.method": request.method,
-              "http.url": request.url,
-              "http.status": 500
-            }) :
-            Effect.annotateLogs(Effect.log(""), {
-              "http.method": request.method,
-              "http.url": request.url,
-              "http.status": exit.value.status
-            })),
+          Effect.flatMap(
+            FiberRef.get(loggerDisabled),
+            (disabled) => {
+              if (disabled) {
+                return Effect.unit
+              }
+              return exit._tag === "Failure" ?
+                Effect.annotateLogs(Effect.log(exit.cause), {
+                  "http.method": request.method,
+                  "http.url": request.url,
+                  "http.status": 500
+                }) :
+                Effect.annotateLogs(Effect.log(""), {
+                  "http.method": request.method,
+                  "http.url": request.url,
+                  "http.status": exit.value.status
+                })
+            }
+          )),
         `http.span.${++counter}`
       )
   )

package/dist/Middleware-934a0c8f.esm.js

@@ -1,41 +0,0 @@
-import { m as make$1, l as logger$1, x as xForwardedHeaders$1 } from './middleware-ea618e68.esm.js';
-
-/**
- * @since 1.0.0
- */
-
-/**
- * @since 1.0.0
- * @category models
- */
-
-/**
- * @since 1.0.0
- */
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const make = make$1;
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const logger = logger$1;
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const xForwardedHeaders = xForwardedHeaders$1;
-
-var Middleware = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  make: make,
-  logger: logger,
-  xForwardedHeaders: xForwardedHeaders
-});
-
-export { Middleware as M, logger as l, make as m, xForwardedHeaders as x };