@effect/platform 0.21.0 → 0.22.0

package/src/internal/http/client.ts

@@ -2,19 +2,18 @@ import type * as ParseResult from "@effect/schema/ParseResult"
 import * as Schema from "@effect/schema/Schema"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
-import { dual, pipe } from "effect/Function"
+import { dual } from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import { pipeArguments } from "effect/Pipeable"
 import type * as Predicate from "effect/Predicate"
 import type * as Schedule from "effect/Schedule"
-import type * as Scope from "effect/Scope"
 import * as Stream from "effect/Stream"
 import type * as Body from "../../Http/Body"
 import type * as Client from "../../Http/Client"
 import type * as Error from "../../Http/ClientError"
 import type * as ClientRequest from "../../Http/ClientRequest"
-import * as IncomingMessage from "../../Http/IncomingMessage"
+import type * as ClientResponse from "../../Http/ClientResponse"
 import * as Method from "../../Http/Method"
 import * as UrlParams from "../../Http/UrlParams"
 import * as internalBody from "./body"
@@ -43,11 +42,41 @@ export const make = <R, E, A>(
   return f as Client.Client<R, E, A>
 }
 
+const withB3Propagation = <R, E>(
+  self: Client.Client.WithResponse<R, E>
+): Client.Client.WithResponse<R, E> =>
+  make((req) =>
+    Effect.flatMap(
+      Effect.map(
+        Effect.currentSpan,
+        Option.match({
+          onNone: () => req,
+          onSome: (span) =>
+            internalRequest.setHeader(
+              req,
+              "b3",
+              `${span.traceId}-${span.spanId}-${span.sampled ? "1" : "0"}${
+                span.parent._tag === "Some" ? `-${span.parent.value.spanId}` : ""
+              }`
+            )
+        })
+      ),
+      self
+    )
+  )
+
+/** @internal */
+export const makeDefault = (
+  f: (
+    request: ClientRequest.ClientRequest
+  ) => Effect.Effect<never, Error.HttpClientError, ClientResponse.ClientResponse>
+): Client.Client.Default => withB3Propagation(make(f))
+
 /** @internal */
 export const fetch = (
   options: RequestInit = {}
 ): Client.Client.Default =>
-  make((request) =>
+  makeDefault((request) =>
     Effect.flatMap(
       UrlParams.makeUrl(request.url, request.urlParams, (_) =>
         internalError.requestError({
@@ -378,35 +407,6 @@ export const mapRequestEffect = dual<
   ) => Client.Client<R | R2, E | E2, A>
 >(2, (self, f) => make((request) => Effect.flatMap(f(request), self)))
 
-/** @internal */
-export const withB3Propagation = <R, E>(
-  self: Client.Client.WithResponse<R, E>
-): Client.Client.WithResponse<R | Scope.Scope, E> =>
-  make((req) =>
-    pipe(
-      Effect.map(
-        Effect.currentSpan,
-        Option.match({
-          onNone: () => req,
-          onSome: (span) => {
-            const parentId = span.parent._tag === "Some" ? `-${span.parent.value.spanId}` : ""
-            return internalRequest.setHeader(
-              req,
-              "b3",
-              `${span.traceId}-${span.spanId}-1${parentId}`
-            )
-          }
-        })
-      ),
-      Effect.flatMap(self),
-      Effect.tap((res) =>
-        Effect.ignore(
-          Effect.flatMap(IncomingMessage.schemaExternalSpan(res), Effect.setParentSpan)
-        )
-      )
-    )
-  )
-
 /** @internal */
 export const retry: {
   <R1, E extends E0, E0, B>(policy: Schedule.Schedule<R1, E0, B>): <R, A>(

package/src/internal/http/middleware.ts

@@ -1,11 +1,8 @@
 import * as Effect from "effect/Effect"
-import { flow } from "effect/Function"
-import * as App from "../../Http/App"
 import * as Headers from "../../Http/Headers"
 import * as IncomingMessage from "../../Http/IncomingMessage"
 import type * as Middleware from "../../Http/Middleware"
 import * as ServerRequest from "../../Http/ServerRequest"
-import * as ServerResponse from "../../Http/ServerResponse"
 
 /** @internal */
 export const make = <M extends Middleware.Middleware>(middleware: M): M => middleware
@@ -37,17 +34,16 @@ export const logger = make((httpApp) => {
 /** @internal */
 export const tracer = make((httpApp) => {
   const appWithStatus = Effect.tap(
-    Effect.zipRight(
-      App.appendPreResponseHandler(b3Response),
-      httpApp
-    ),
+    httpApp,
     (response) => Effect.annotateCurrentSpan("http.status", response.status)
   )
   return Effect.flatMap(
     ServerRequest.ServerRequest,
     (request) =>
       Effect.flatMap(
-        Effect.orElseSucceed(IncomingMessage.schemaExternalSpan(request), () => undefined),
+        request.headers["x-b3-traceid"] || request.headers["b3"] ?
+          Effect.orElseSucceed(IncomingMessage.schemaExternalSpan(request), () => undefined) :
+          Effect.succeed(undefined),
         (parent) =>
           Effect.withSpan(
             appWithStatus,
@@ -58,21 +54,6 @@ export const tracer = make((httpApp) => {
   )
 })
 
-const b3Response: App.PreResponseHandler = (_request, response) =>
-  Effect.flatMap(
-    Effect.currentSpan,
-    (span) =>
-      span._tag === "Some"
-        ? ServerResponse.setHeader(
-          response,
-          "b3",
-          `${span.value.traceId}-${span.value.spanId}-1${
-            span.value.parent._tag === "Some" ? `-${span.value.parent.value.spanId}` : ""
-          }`
-        )
-        : response
-  )
-
 /** @internal */
 export const xForwardedHeaders = make((httpApp) =>
   Effect.updateService(httpApp, ServerRequest.ServerRequest, (request) =>
@@ -87,6 +68,3 @@ export const xForwardedHeaders = make((httpApp) =>
       })
       : request)
 )
-
-/** @internal */
-export const loggerTracer = flow(tracer, logger)

package/dist/Middleware-04ddadf1.esm.js

@@ -1,100 +0,0 @@
-import * as Effect from 'effect/Effect';
-import { flow } from 'effect/Function';
-import { a as appendPreResponseHandler } from './App-1ca51fa7.esm.js';
-import { s as set } from './Headers-58b56a08.esm.js';
-import { schemaExternalSpan } from '../Http/IncomingMessage/dist/effect-platform-Http-IncomingMessage.esm.js';
-import { a as ServerRequest } from './ServerRequest-41c7e979.esm.js';
-import { s as setHeader } from './ServerResponse-03c252ea.esm.js';
-
-/** @internal */
-const make$1 = middleware => middleware;
-
-/** @internal */
-const logger$1 = /*#__PURE__*/make$1(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
-  })), `http.span.${++counter}`));
-});
-
-/** @internal */
-const tracer$1 = /*#__PURE__*/make$1(httpApp => {
-  const appWithStatus = Effect.tap(Effect.zipRight(appendPreResponseHandler(b3Response), httpApp), response => Effect.annotateCurrentSpan("http.status", response.status));
-  return Effect.flatMap(ServerRequest, request => Effect.flatMap(Effect.orElseSucceed(schemaExternalSpan(request), () => undefined), parent => Effect.withSpan(appWithStatus, `http ${request.method}`, {
-    attributes: {
-      "http.method": request.method,
-      "http.url": request.url
-    },
-    parent
-  })));
-});
-const b3Response = (_request, response) => Effect.flatMap(Effect.currentSpan, span => span._tag === "Some" ? setHeader(response, "b3", `${span.value.traceId}-${span.value.spanId}-1${span.value.parent._tag === "Some" ? `-${span.value.parent.value.spanId}` : ""}`) : response);
-
-/** @internal */
-const xForwardedHeaders$1 = /*#__PURE__*/make$1(httpApp => Effect.updateService(httpApp, ServerRequest, request => request.headers["x-forwarded-host"] ? request.modify({
-  headers: set(request.headers, "host", request.headers["x-forwarded-host"]),
-  remoteAddress: request.headers["x-forwarded-for"]?.split(",")[0].trim()
-}) : request));
-
-/** @internal */
-const loggerTracer$1 = /*#__PURE__*/flow(tracer$1, logger$1);
-
-/**
- * @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 tracer = tracer$1;
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const loggerTracer = loggerTracer$1;
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const xForwardedHeaders = xForwardedHeaders$1;
-
-var Middleware = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  make: make,
-  logger: logger,
-  tracer: tracer,
-  loggerTracer: loggerTracer,
-  xForwardedHeaders: xForwardedHeaders
-});
-
-export { Middleware as M, loggerTracer as a, logger as l, make as m, tracer as t, xForwardedHeaders as x };

package/dist/Middleware-3e264366.cjs.dev.js

@@ -1,127 +0,0 @@
-'use strict';
-
-var Effect = require('effect/Effect');
-var Function = require('effect/Function');
-var Http_App_dist_effectPlatformHttpApp = require('./App-18152f12.cjs.dev.js');
-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_ServerResponse_dist_effectPlatformHttpServerResponse = require('./ServerResponse-9af42ecb.cjs.dev.js');
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
-
-var Effect__namespace = /*#__PURE__*/_interopNamespace(Effect);
-
-/** @internal */
-const make$1 = middleware => middleware;
-
-/** @internal */
-const logger$1 = /*#__PURE__*/make$1(httpApp => {
-  let counter = 0;
-  return Effect__namespace.flatMap(Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest$1, 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
-  })), `http.span.${++counter}`));
-});
-
-/** @internal */
-const tracer$1 = /*#__PURE__*/make$1(httpApp => {
-  const appWithStatus = Effect__namespace.tap(Effect__namespace.zipRight(Http_App_dist_effectPlatformHttpApp.appendPreResponseHandler(b3Response), httpApp), response => Effect__namespace.annotateCurrentSpan("http.status", response.status));
-  return Effect__namespace.flatMap(Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest$1, request => Effect__namespace.flatMap(Effect__namespace.orElseSucceed(Http_IncomingMessage_dist_effectPlatformHttpIncomingMessage.schemaExternalSpan(request), () => undefined), parent => Effect__namespace.withSpan(appWithStatus, `http ${request.method}`, {
-    attributes: {
-      "http.method": request.method,
-      "http.url": request.url
-    },
-    parent
-  })));
-});
-const b3Response = (_request, response) => Effect__namespace.flatMap(Effect__namespace.currentSpan, span => span._tag === "Some" ? Http_ServerResponse_dist_effectPlatformHttpServerResponse.setHeader(response, "b3", `${span.value.traceId}-${span.value.spanId}-1${span.value.parent._tag === "Some" ? `-${span.value.parent.value.spanId}` : ""}`) : response);
-
-/** @internal */
-const xForwardedHeaders$1 = /*#__PURE__*/make$1(httpApp => Effect__namespace.updateService(httpApp, Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest$1, request => request.headers["x-forwarded-host"] ? request.modify({
-  headers: Http_Headers_dist_effectPlatformHttpHeaders.set(request.headers, "host", request.headers["x-forwarded-host"]),
-  remoteAddress: request.headers["x-forwarded-for"]?.split(",")[0].trim()
-}) : request));
-
-/** @internal */
-const loggerTracer$1 = /*#__PURE__*/Function.flow(tracer$1, logger$1);
-
-/**
- * @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 tracer = tracer$1;
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const loggerTracer = loggerTracer$1;
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const xForwardedHeaders = xForwardedHeaders$1;
-
-var Middleware = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  make: make,
-  logger: logger,
-  tracer: tracer,
-  loggerTracer: loggerTracer,
-  xForwardedHeaders: xForwardedHeaders
-});
-
-exports.Middleware = Middleware;
-exports.logger = logger;
-exports.loggerTracer = loggerTracer;
-exports.make = make;
-exports.tracer = tracer;
-exports.xForwardedHeaders = xForwardedHeaders;

package/dist/Middleware-8b05423d.cjs.prod.js

@@ -1,127 +0,0 @@
-'use strict';
-
-var Effect = require('effect/Effect');
-var Function = require('effect/Function');
-var Http_App_dist_effectPlatformHttpApp = require('./App-d8b904fa.cjs.prod.js');
-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_ServerResponse_dist_effectPlatformHttpServerResponse = require('./ServerResponse-db87bde2.cjs.prod.js');
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
-
-var Effect__namespace = /*#__PURE__*/_interopNamespace(Effect);
-
-/** @internal */
-const make$1 = middleware => middleware;
-
-/** @internal */
-const logger$1 = /*#__PURE__*/make$1(httpApp => {
-  let counter = 0;
-  return Effect__namespace.flatMap(Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest$1, 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
-  })), `http.span.${++counter}`));
-});
-
-/** @internal */
-const tracer$1 = /*#__PURE__*/make$1(httpApp => {
-  const appWithStatus = Effect__namespace.tap(Effect__namespace.zipRight(Http_App_dist_effectPlatformHttpApp.appendPreResponseHandler(b3Response), httpApp), response => Effect__namespace.annotateCurrentSpan("http.status", response.status));
-  return Effect__namespace.flatMap(Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest$1, request => Effect__namespace.flatMap(Effect__namespace.orElseSucceed(Http_IncomingMessage_dist_effectPlatformHttpIncomingMessage.schemaExternalSpan(request), () => undefined), parent => Effect__namespace.withSpan(appWithStatus, `http ${request.method}`, {
-    attributes: {
-      "http.method": request.method,
-      "http.url": request.url
-    },
-    parent
-  })));
-});
-const b3Response = (_request, response) => Effect__namespace.flatMap(Effect__namespace.currentSpan, span => span._tag === "Some" ? Http_ServerResponse_dist_effectPlatformHttpServerResponse.setHeader(response, "b3", `${span.value.traceId}-${span.value.spanId}-1${span.value.parent._tag === "Some" ? `-${span.value.parent.value.spanId}` : ""}`) : response);
-
-/** @internal */
-const xForwardedHeaders$1 = /*#__PURE__*/make$1(httpApp => Effect__namespace.updateService(httpApp, Http_ServerRequest_dist_effectPlatformHttpServerRequest.ServerRequest$1, request => request.headers["x-forwarded-host"] ? request.modify({
-  headers: Http_Headers_dist_effectPlatformHttpHeaders.set(request.headers, "host", request.headers["x-forwarded-host"]),
-  remoteAddress: request.headers["x-forwarded-for"]?.split(",")[0].trim()
-}) : request));
-
-/** @internal */
-const loggerTracer$1 = /*#__PURE__*/Function.flow(tracer$1, logger$1);
-
-/**
- * @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 tracer = tracer$1;
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const loggerTracer = loggerTracer$1;
-
-/**
- * @since 1.0.0
- * @category constructors
- */
-const xForwardedHeaders = xForwardedHeaders$1;
-
-var Middleware = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  make: make,
-  logger: logger,
-  tracer: tracer,
-  loggerTracer: loggerTracer,
-  xForwardedHeaders: xForwardedHeaders
-});
-
-exports.Middleware = Middleware;
-exports.logger = logger;
-exports.loggerTracer = loggerTracer;
-exports.make = make;
-exports.tracer = tracer;
-exports.xForwardedHeaders = xForwardedHeaders;