@effect/platform 0.13.8 → 0.13.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -14,15 +14,18 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
14
14
|
const make = middleware => middleware;
|
|
15
15
|
/** @internal */
|
|
16
16
|
exports.make = make;
|
|
17
|
-
const logger = /*#__PURE__*/make(httpApp =>
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
17
|
+
const logger = /*#__PURE__*/make(httpApp => {
|
|
18
|
+
let counter = 0;
|
|
19
|
+
return Effect.flatMap(ServerRequest.ServerRequest, request => Effect.withLogSpan(Effect.tap(Effect.tapErrorCause(httpApp, cause => Effect.annotateLogs(Effect.log(cause), {
|
|
20
|
+
"http.method": request.method,
|
|
21
|
+
"http.url": request.url,
|
|
22
|
+
"http.status": 500
|
|
23
|
+
})), response => Effect.annotateLogs(Effect.log(""), {
|
|
24
|
+
"http.method": request.method,
|
|
25
|
+
"http.url": request.url,
|
|
26
|
+
"http.status": response.status
|
|
27
|
+
})), `http.span.${++counter}`));
|
|
28
|
+
});
|
|
26
29
|
/** @internal */
|
|
27
30
|
exports.logger = logger;
|
|
28
31
|
const tracer = /*#__PURE__*/make(httpApp => Effect.flatMap(ServerRequest.ServerRequest, request => Effect.withSpan(Effect.tap(httpApp, response => Effect.annotateCurrentSpan("http.status", response.status)), `http ${request.method}`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","names":["_Function","require","Effect","_interopRequireWildcard","Headers","ServerRequest","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","middleware","exports","logger","httpApp","
|
|
1
|
+
{"version":3,"file":"middleware.js","names":["_Function","require","Effect","_interopRequireWildcard","Headers","ServerRequest","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","middleware","exports","logger","httpApp","counter","flatMap","request","withLogSpan","tap","tapErrorCause","cause","annotateLogs","log","method","url","response","status","tracer","withSpan","annotateCurrentSpan","attributes","xForwardedHeaders","updateService","headers","replaceHeaders","loggerTracer","flow"],"sources":["../../src/internal/http/middleware.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -5,15 +5,18 @@ import * as ServerRequest from "@effect/platform/Http/ServerRequest";
|
|
|
5
5
|
/** @internal */
|
|
6
6
|
export const make = middleware => middleware;
|
|
7
7
|
/** @internal */
|
|
8
|
-
export const logger = /*#__PURE__*/make(httpApp =>
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
8
|
+
export const logger = /*#__PURE__*/make(httpApp => {
|
|
9
|
+
let counter = 0;
|
|
10
|
+
return Effect.flatMap(ServerRequest.ServerRequest, request => Effect.withLogSpan(Effect.tap(Effect.tapErrorCause(httpApp, cause => Effect.annotateLogs(Effect.log(cause), {
|
|
11
|
+
"http.method": request.method,
|
|
12
|
+
"http.url": request.url,
|
|
13
|
+
"http.status": 500
|
|
14
|
+
})), response => Effect.annotateLogs(Effect.log(""), {
|
|
15
|
+
"http.method": request.method,
|
|
16
|
+
"http.url": request.url,
|
|
17
|
+
"http.status": response.status
|
|
18
|
+
})), `http.span.${++counter}`));
|
|
19
|
+
});
|
|
17
20
|
/** @internal */
|
|
18
21
|
export const tracer = /*#__PURE__*/make(httpApp => Effect.flatMap(ServerRequest.ServerRequest, request => Effect.withSpan(Effect.tap(httpApp, response => Effect.annotateCurrentSpan("http.status", response.status)), `http ${request.method}`, {
|
|
19
22
|
attributes: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.mjs","names":["flow","Effect","Headers","ServerRequest","make","middleware","logger","httpApp","
|
|
1
|
+
{"version":3,"file":"middleware.mjs","names":["flow","Effect","Headers","ServerRequest","make","middleware","logger","httpApp","counter","flatMap","request","withLogSpan","tap","tapErrorCause","cause","annotateLogs","log","method","url","response","status","tracer","withSpan","annotateCurrentSpan","attributes","xForwardedHeaders","updateService","headers","replaceHeaders","set","loggerTracer"],"sources":["../../../src/internal/http/middleware.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAI,QAAQ,uBAAuB;AAC5C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,OAAO,MAAM,+BAA+B;AAExD,OAAO,KAAKC,aAAa,MAAM,qCAAqC;AAEpE;AACA,OAAO,MAAMC,IAAI,GAAqCC,UAAa,IAAQA,UAAU;AAErF;AACA,OAAO,MAAMC,MAAM,gBAAGF,IAAI,CAAEG,OAAO,IAAI;EACrC,IAAIC,OAAO,GAAG,CAAC;EACf,OAAOP,MAAM,CAACQ,OAAO,CACnBN,aAAa,CAACA,aAAa,EAC1BO,OAAO,IACNT,MAAM,CAACU,WAAW,CAChBV,MAAM,CAACW,GAAG,CACRX,MAAM,CAACY,aAAa,CAACN,OAAO,EAAGO,KAAK,IAClCb,MAAM,CAACc,YAAY,CAACd,MAAM,CAACe,GAAG,CAACF,KAAK,CAAC,EAAE;IACrC,aAAa,EAAEJ,OAAO,CAACO,MAAM;IAC7B,UAAU,EAAEP,OAAO,CAACQ,GAAG;IACvB,aAAa,EAAE;GAChB,CAAC,CAAC,EACJC,QAAQ,IACPlB,MAAM,CAACc,YAAY,CAACd,MAAM,CAACe,GAAG,CAAC,EAAE,CAAC,EAAE;IAClC,aAAa,EAAEN,OAAO,CAACO,MAAM;IAC7B,UAAU,EAAEP,OAAO,CAACQ,GAAG;IACvB,aAAa,EAAEC,QAAQ,CAACC;GACzB,CAAC,CACL,EACD,aAAa,EAAEZ,OAAO,EAAE,CACzB,CACJ;AACH,CAAC,CAAC;AAEF;AACA,OAAO,MAAMa,MAAM,gBAAGjB,IAAI,CAAEG,OAAO,IACjCN,MAAM,CAACQ,OAAO,CACZN,aAAa,CAACA,aAAa,EAC1BO,OAAO,IACNT,MAAM,CAACqB,QAAQ,CACbrB,MAAM,CAACW,GAAG,CACRL,OAAO,EACNY,QAAQ,IAAKlB,MAAM,CAACsB,mBAAmB,CAAC,aAAa,EAAEJ,QAAQ,CAACC,MAAM,CAAC,CACzE,EACD,QAAQV,OAAO,CAACO,MAAM,EAAE,EACxB;EAAEO,UAAU,EAAE;IAAE,aAAa,EAAEd,OAAO,CAACO,MAAM;IAAE,UAAU,EAAEP,OAAO,CAACQ;EAAG;AAAE,CAAE,CAC3E,CACJ,CACF;AAED;AACA,OAAO,MAAMO,iBAAiB,gBAAGrB,IAAI,CAAEG,OAAO,IAC5CN,MAAM,CAACyB,aAAa,CAACnB,OAAO,EAAEJ,aAAa,CAACA,aAAa,EAAGO,OAAO,IACjEA,OAAO,CAACiB,OAAO,CAAC,kBAAkB,CAAC,GAC/BjB,OAAO,CAACkB,cAAc,CAAC1B,OAAO,CAAC2B,GAAG,CAClCnB,OAAO,CAACiB,OAAO,EACf,MAAM,EACNjB,OAAO,CAACiB,OAAO,CAAC,kBAAkB,CAAC,CACpC,CAAC,GACAjB,OAAO,CAAC,CACf;AAED;AACA,OAAO,MAAMoB,YAAY,gBAAG9B,IAAI,CAACqB,MAAM,EAAEf,MAAM,CAAC"}
|
package/package.json
CHANGED
|
@@ -8,11 +8,12 @@ import * as ServerRequest from "@effect/platform/Http/ServerRequest"
|
|
|
8
8
|
export const make = <M extends Middleware.Middleware>(middleware: M): M => middleware
|
|
9
9
|
|
|
10
10
|
/** @internal */
|
|
11
|
-
export const logger = make((httpApp) =>
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
export const logger = make((httpApp) => {
|
|
12
|
+
let counter = 0
|
|
13
|
+
return Effect.flatMap(
|
|
14
|
+
ServerRequest.ServerRequest,
|
|
15
|
+
(request) =>
|
|
16
|
+
Effect.withLogSpan(
|
|
16
17
|
Effect.tap(
|
|
17
18
|
Effect.tapErrorCause(httpApp, (cause) =>
|
|
18
19
|
Effect.annotateLogs(Effect.log(cause), {
|
|
@@ -26,11 +27,11 @@ export const logger = make((httpApp) =>
|
|
|
26
27
|
"http.url": request.url,
|
|
27
28
|
"http.status": response.status
|
|
28
29
|
})
|
|
29
|
-
)
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
),
|
|
31
|
+
`http.span.${++counter}`
|
|
32
|
+
)
|
|
32
33
|
)
|
|
33
|
-
)
|
|
34
|
+
})
|
|
34
35
|
|
|
35
36
|
/** @internal */
|
|
36
37
|
export const tracer = make((httpApp) =>
|