evlog 2.14.0 → 2.15.0
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.
- package/LICENSE +21 -0
- package/README.md +49 -19
- package/dist/adapters/axiom.d.mts +18 -27
- package/dist/adapters/axiom.d.mts.map +1 -1
- package/dist/adapters/axiom.mjs +40 -30
- package/dist/adapters/axiom.mjs.map +1 -1
- package/dist/adapters/better-stack.d.mts +11 -24
- package/dist/adapters/better-stack.d.mts.map +1 -1
- package/dist/adapters/better-stack.mjs +34 -29
- package/dist/adapters/better-stack.mjs.map +1 -1
- package/dist/adapters/datadog.d.mts +1 -1
- package/dist/adapters/datadog.d.mts.map +1 -1
- package/dist/adapters/datadog.mjs +10 -4
- package/dist/adapters/datadog.mjs.map +1 -1
- package/dist/adapters/fs.d.mts +2 -2
- package/dist/adapters/fs.d.mts.map +1 -1
- package/dist/adapters/fs.mjs +19 -7
- package/dist/adapters/fs.mjs.map +1 -1
- package/dist/adapters/hyperdx.d.mts +1 -1
- package/dist/adapters/hyperdx.mjs +1 -2
- package/dist/adapters/hyperdx.mjs.map +1 -1
- package/dist/adapters/otlp.d.mts +1 -1
- package/dist/adapters/otlp.d.mts.map +1 -1
- package/dist/adapters/otlp.mjs +36 -31
- package/dist/adapters/otlp.mjs.map +1 -1
- package/dist/adapters/posthog.d.mts +50 -70
- package/dist/adapters/posthog.d.mts.map +1 -1
- package/dist/adapters/posthog.mjs +50 -85
- package/dist/adapters/posthog.mjs.map +1 -1
- package/dist/adapters/sentry.d.mts +1 -1
- package/dist/adapters/sentry.d.mts.map +1 -1
- package/dist/adapters/sentry.mjs +15 -5
- package/dist/adapters/sentry.mjs.map +1 -1
- package/dist/ai/index.d.mts +1 -1
- package/dist/{audit-d9esRZOK.mjs → audit--n0QRR2Y.mjs} +202 -20
- package/dist/audit--n0QRR2Y.mjs.map +1 -0
- package/dist/{audit-mUutdf6A.d.mts → audit-CJl-wZ10.d.mts} +144 -2
- package/dist/audit-CJl-wZ10.d.mts.map +1 -0
- package/dist/better-auth/index.d.mts +1 -1
- package/dist/better-auth/index.mjs.map +1 -1
- package/dist/browser.d.mts +1 -1
- package/dist/define-D6OJdSUH.mjs +63 -0
- package/dist/define-D6OJdSUH.mjs.map +1 -0
- package/dist/define-Fp8TrdEB.d.mts +57 -0
- package/dist/define-Fp8TrdEB.d.mts.map +1 -0
- package/dist/{dist-Do8P4zWd.mjs → dist-BIlS38vi.mjs} +1 -1
- package/dist/dist-BIlS38vi.mjs.map +1 -0
- package/dist/drain-ByWUeOQC.mjs +160 -0
- package/dist/drain-ByWUeOQC.mjs.map +1 -0
- package/dist/elysia/index.d.mts +25 -2
- package/dist/elysia/index.d.mts.map +1 -1
- package/dist/elysia/index.mjs +53 -20
- package/dist/elysia/index.mjs.map +1 -1
- package/dist/enricher-BA6viylF.mjs +95 -0
- package/dist/enricher-BA6viylF.mjs.map +1 -0
- package/dist/enricher-CLSnrzrr.d.mts +42 -0
- package/dist/enricher-CLSnrzrr.d.mts.map +1 -0
- package/dist/enrichers.d.mts +16 -9
- package/dist/enrichers.d.mts.map +1 -1
- package/dist/enrichers.mjs +81 -64
- package/dist/enrichers.mjs.map +1 -1
- package/dist/{error-D1FZI2Kd.d.mts → error-C-66_G2M.d.mts} +2 -2
- package/dist/{error-D1FZI2Kd.d.mts.map → error-C-66_G2M.d.mts.map} +1 -1
- package/dist/error.d.mts +1 -1
- package/dist/{errors-BJRXUfMg.mjs → errors-BQgyQ9xe.mjs} +1 -1
- package/dist/{errors-BJRXUfMg.mjs.map → errors-BQgyQ9xe.mjs.map} +1 -1
- package/dist/{errors-NIXCyk6I.d.mts → errors-DQoYsDW1.d.mts} +2 -2
- package/dist/{errors-NIXCyk6I.d.mts.map → errors-DQoYsDW1.d.mts.map} +1 -1
- package/dist/event-ef-5Dbxg.mjs +53 -0
- package/dist/event-ef-5Dbxg.mjs.map +1 -0
- package/dist/express/index.d.mts +2 -2
- package/dist/express/index.d.mts.map +1 -1
- package/dist/express/index.mjs +17 -15
- package/dist/express/index.mjs.map +1 -1
- package/dist/fastify/index.d.mts +2 -2
- package/dist/fastify/index.d.mts.map +1 -1
- package/dist/fastify/index.mjs +19 -20
- package/dist/fastify/index.mjs.map +1 -1
- package/dist/fork-D44V93-K.mjs +227 -0
- package/dist/fork-D44V93-K.mjs.map +1 -0
- package/dist/{headers-D74M0wsg.mjs → headers-CU-QqnYg.mjs} +19 -2
- package/dist/headers-CU-QqnYg.mjs.map +1 -0
- package/dist/hono/index.d.mts +2 -2
- package/dist/hono/index.d.mts.map +1 -1
- package/dist/hono/index.mjs +14 -10
- package/dist/hono/index.mjs.map +1 -1
- package/dist/http.d.mts +1 -1
- package/dist/http.d.mts.map +1 -1
- package/dist/http.mjs +3 -2
- package/dist/http.mjs.map +1 -1
- package/dist/index.d.mts +8 -7
- package/dist/index.mjs +3 -2
- package/dist/integration-Bz8X6_Lb.mjs +75 -0
- package/dist/integration-Bz8X6_Lb.mjs.map +1 -0
- package/dist/{logger-b3epPH0N.d.mts → logger-Brt5-WMK.d.mts} +28 -3
- package/dist/logger-Brt5-WMK.d.mts.map +1 -0
- package/dist/logger.d.mts +2 -2
- package/dist/logger.mjs +2 -2
- package/dist/middleware-CGM-bOvE.d.mts +72 -0
- package/dist/middleware-CGM-bOvE.d.mts.map +1 -0
- package/dist/nestjs/index.d.mts +2 -2
- package/dist/nestjs/index.mjs +3 -4
- package/dist/nestjs/index.mjs.map +1 -1
- package/dist/next/client.d.mts +1 -1
- package/dist/next/index.d.mts +4 -4
- package/dist/next/index.mjs +3 -3
- package/dist/next/index.mjs.map +1 -1
- package/dist/next/instrumentation.d.mts +1 -1
- package/dist/next/instrumentation.mjs +1 -1
- package/dist/next/instrumentation.mjs.map +1 -1
- package/dist/nitro/errorHandler.mjs +2 -2
- package/dist/nitro/errorHandler.mjs.map +1 -1
- package/dist/nitro/module.d.mts +2 -2
- package/dist/nitro/plugin.mjs +21 -11
- package/dist/nitro/plugin.mjs.map +1 -1
- package/dist/nitro/v3/errorHandler.mjs +3 -3
- package/dist/nitro/v3/index.d.mts +2 -2
- package/dist/nitro/v3/middleware.mjs.map +1 -1
- package/dist/nitro/v3/module.d.mts +1 -1
- package/dist/nitro/v3/plugin.mjs +29 -17
- package/dist/nitro/v3/plugin.mjs.map +1 -1
- package/dist/nitro/v3/useLogger.d.mts +1 -1
- package/dist/nitro/v3/useLogger.mjs.map +1 -1
- package/dist/{nitro-DenB86W6.d.mts → nitro-DHPb9dXG.d.mts} +2 -2
- package/dist/{nitro-DenB86W6.d.mts.map → nitro-DHPb9dXG.d.mts.map} +1 -1
- package/dist/{nitro-OmT_M4Pb.mjs → nitro-DavLelNz.mjs} +2 -2
- package/dist/nitro-DavLelNz.mjs.map +1 -0
- package/dist/{nitroConfigBridge-C37lXaNm.mjs → nitroConfigBridge-aZ1e5upQ.mjs} +1 -1
- package/dist/nitroConfigBridge-aZ1e5upQ.mjs.map +1 -0
- package/dist/nuxt/module.d.mts +1 -1
- package/dist/nuxt/module.mjs +2 -2
- package/dist/{parseError-BR9pocvY.d.mts → parseError-B1zJZvQ5.d.mts} +2 -2
- package/dist/parseError-B1zJZvQ5.d.mts.map +1 -0
- package/dist/pipeline.mjs.map +1 -1
- package/dist/react-router/index.d.mts +2 -2
- package/dist/react-router/index.mjs +3 -4
- package/dist/react-router/index.mjs.map +1 -1
- package/dist/{routes-CGPmbzCZ.mjs → routes-B48wm7Pb.mjs} +1 -1
- package/dist/{routes-CGPmbzCZ.mjs.map → routes-B48wm7Pb.mjs.map} +1 -1
- package/dist/runtime/client/log.d.mts +1 -1
- package/dist/runtime/client/log.mjs +2 -2
- package/dist/runtime/client/log.mjs.map +1 -1
- package/dist/runtime/client/plugin.mjs.map +1 -1
- package/dist/runtime/server/routes/_evlog/ingest.post.mjs +21 -10
- package/dist/runtime/server/routes/_evlog/ingest.post.mjs.map +1 -1
- package/dist/runtime/server/useLogger.d.mts +1 -1
- package/dist/runtime/server/useLogger.mjs.map +1 -1
- package/dist/runtime/utils/parseError.d.mts +2 -2
- package/dist/runtime/utils/parseError.mjs +1 -1
- package/dist/{_severity-CQijvfhU.mjs → severity-BYWZ96Sb.mjs} +6 -2
- package/dist/severity-BYWZ96Sb.mjs.map +1 -0
- package/dist/{source-location-DRvDDqfq.mjs → source-location-Dco0cRTz.mjs} +3 -3
- package/dist/source-location-Dco0cRTz.mjs.map +1 -0
- package/dist/storage-BT-3fT1-.mjs +27 -0
- package/dist/storage-BT-3fT1-.mjs.map +1 -0
- package/dist/sveltekit/index.d.mts +2 -2
- package/dist/sveltekit/index.mjs +5 -6
- package/dist/sveltekit/index.mjs.map +1 -1
- package/dist/toolkit.d.mts +288 -12
- package/dist/toolkit.d.mts.map +1 -1
- package/dist/toolkit.mjs +13 -7
- package/dist/types.d.mts +1 -1
- package/dist/{useLogger-C56tDPwf.d.mts → useLogger-Cb1R6bQE.d.mts} +2 -2
- package/dist/{useLogger-C56tDPwf.d.mts.map → useLogger-Cb1R6bQE.d.mts.map} +1 -1
- package/dist/{utils-DzGCLRFe.d.mts → utils-gQCeZMbg.d.mts} +4 -3
- package/dist/utils-gQCeZMbg.d.mts.map +1 -0
- package/dist/utils.d.mts +2 -2
- package/dist/utils.mjs +7 -1
- package/dist/utils.mjs.map +1 -1
- package/dist/vite/index.d.mts +1 -1
- package/dist/vite/index.mjs +1 -1
- package/dist/vite/index.mjs.map +1 -1
- package/dist/workers.d.mts +48 -4
- package/dist/workers.d.mts.map +1 -1
- package/dist/workers.mjs +32 -5
- package/dist/workers.mjs.map +1 -1
- package/package.json +38 -39
- package/dist/_drain-CmCtsuF6.mjs +0 -23
- package/dist/_drain-CmCtsuF6.mjs.map +0 -1
- package/dist/_http-CHSsrWDJ.mjs +0 -71
- package/dist/_http-CHSsrWDJ.mjs.map +0 -1
- package/dist/_severity-CQijvfhU.mjs.map +0 -1
- package/dist/audit-d9esRZOK.mjs.map +0 -1
- package/dist/audit-mUutdf6A.d.mts.map +0 -1
- package/dist/dist-Do8P4zWd.mjs.map +0 -1
- package/dist/fork-CTJXnpl8.mjs +0 -72
- package/dist/fork-CTJXnpl8.mjs.map +0 -1
- package/dist/headers-D74M0wsg.mjs.map +0 -1
- package/dist/logger-b3epPH0N.d.mts.map +0 -1
- package/dist/middleware-BWOJ7JI0.mjs +0 -123
- package/dist/middleware-BWOJ7JI0.mjs.map +0 -1
- package/dist/middleware-BYf26Lfu.d.mts +0 -93
- package/dist/middleware-BYf26Lfu.d.mts.map +0 -1
- package/dist/nitro-OmT_M4Pb.mjs.map +0 -1
- package/dist/nitroConfigBridge-C37lXaNm.mjs.map +0 -1
- package/dist/parseError-BR9pocvY.d.mts.map +0 -1
- package/dist/source-location-DRvDDqfq.mjs.map +0 -1
- package/dist/storage-CFGTn37X.mjs +0 -46
- package/dist/storage-CFGTn37X.mjs.map +0 -1
- package/dist/utils-DzGCLRFe.d.mts.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { R as ErrorOptions } from "./audit-
|
|
1
|
+
import { R as ErrorOptions } from "./audit-CJl-wZ10.mjs";
|
|
2
2
|
|
|
3
3
|
//#region src/error.d.ts
|
|
4
4
|
/**
|
|
@@ -67,4 +67,4 @@ declare class EvlogError extends Error {
|
|
|
67
67
|
declare function createError(options: ErrorOptions | string): EvlogError;
|
|
68
68
|
//#endregion
|
|
69
69
|
export { createError as n, EvlogError as t };
|
|
70
|
-
//# sourceMappingURL=error-
|
|
70
|
+
//# sourceMappingURL=error-C-66_G2M.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-
|
|
1
|
+
{"version":3,"file":"error-C-66_G2M.d.mts","names":[],"sources":["../src/error.ts"],"mappings":";;;;;AAqBA;;;;;;;;;;;;;cAAa,UAAA,SAAmB,KAAA;EAY1B;EAAA,SATK,MAAA;EAAA,SACA,GAAA;EAAA,SACA,GAAA;EAAA,SACA,IAAA;EAqCL;;;;EAAA,IA/BA,QAAA,CAAA,GAAY,MAAA;cAIJ,OAAA,EAAS,YAAA;EA0CqB;EAAA,IAftC,UAAA,CAAA;EAuDJ;EAAA,IAlDI,UAAA,CAAA;EAkDY;EAAA,IA7CZ,aAAA,CAAA;EAiFU;EAAA,IA5EV,IAAA,CAAA;IAAU,GAAA;IAAc,GAAA;IAAc,IAAA;EAAA;EAOjC,QAAA,CAAA;EAiCT,MAAA,CAAA,GAAU,MAAA;AAAA;;;;;;;;;;;;;;;;;;;;;;iBAoCI,WAAA,CAAY,OAAA,EAAS,YAAA,YAAwB,UAAA"}
|
package/dist/error.d.mts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { n as createError, t as EvlogError } from "./error-
|
|
1
|
+
import { n as createError, t as EvlogError } from "./error-C-66_G2M.mjs";
|
|
2
2
|
export { EvlogError, createError, createError as createEvlogError };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors-
|
|
1
|
+
{"version":3,"file":"errors-BQgyQ9xe.mjs","names":[],"sources":["../src/shared/errors.ts"],"sourcesContent":["/**\n * Extract HTTP status from an error, checking both `status` and `statusCode`.\n *\n * Works with any error shape (H3, Nitro, EvlogError, plain objects).\n *\n * @beta This function is part of the evlog toolkit API for building custom framework integrations.\n */\nexport function extractErrorStatus(error: unknown): number {\n if (error === null || typeof error !== 'object') return 500\n const raw = (error as { status?: unknown }).status\n ?? (error as { statusCode?: unknown }).statusCode\n const status = Number(raw)\n return Number.isFinite(status) ? status : 500\n}\n"],"mappings":";;;;;;;;AAOA,SAAgB,mBAAmB,OAAwB;AACzD,KAAI,UAAU,QAAQ,OAAO,UAAU,SAAU,QAAO;CACxD,MAAM,MAAO,MAA+B,UACtC,MAAmC;CACzC,MAAM,SAAS,OAAO,IAAI;AAC1B,QAAO,OAAO,SAAS,OAAO,GAAG,SAAS"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Z as RouteConfig } from "./audit-
|
|
1
|
+
import { Z as RouteConfig } from "./audit-CJl-wZ10.mjs";
|
|
2
2
|
|
|
3
3
|
//#region src/shared/routes.d.ts
|
|
4
4
|
declare function shouldLog(path: string, include?: string[], exclude?: string[]): boolean;
|
|
@@ -36,4 +36,4 @@ declare function getServiceForPath(path: string, routes?: Record<string, RouteCo
|
|
|
36
36
|
declare function extractErrorStatus(error: unknown): number;
|
|
37
37
|
//#endregion
|
|
38
38
|
export { getServiceForPath as n, shouldLog as r, extractErrorStatus as t };
|
|
39
|
-
//# sourceMappingURL=errors-
|
|
39
|
+
//# sourceMappingURL=errors-DQoYsDW1.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors-
|
|
1
|
+
{"version":3,"file":"errors-DQoYsDW1.d.mts","names":[],"sources":["../src/shared/routes.ts","../src/shared/errors.ts"],"mappings":";;;iBAGgB,SAAA,CAAU,IAAA,UAAc,OAAA,aAAoB,OAAA;;AAA5D;;;;;;;;;AAsCA;;;;;;;;;;;iBAAgB,iBAAA,CAAkB,IAAA,UAAc,MAAA,GAAS,MAAA,SAAe,WAAA;;;;;;AAtCxE;;;;iBCIgB,kBAAA,CAAmB,KAAA"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
//#region src/shared/event.ts
|
|
2
|
+
/**
|
|
3
|
+
* Helpers for building / mutating wide events from inside enrichers and adapters.
|
|
4
|
+
*/
|
|
5
|
+
/**
|
|
6
|
+
* Merge a computed value onto an existing event field. By default, existing
|
|
7
|
+
* object values win over computed ones — so `log.set({ geo: ... })` keeps
|
|
8
|
+
* precedence over an enricher's automatic detection.
|
|
9
|
+
*/
|
|
10
|
+
function mergeEventField(existing, computed, overwrite) {
|
|
11
|
+
if (overwrite || existing === void 0 || existing === null || typeof existing !== "object") return computed;
|
|
12
|
+
return {
|
|
13
|
+
...computed,
|
|
14
|
+
...existing
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
/** Convert a JS value to a {@link TypedAttributeValue}. Objects are JSON-serialized. */
|
|
18
|
+
function toTypedAttributeValue(value) {
|
|
19
|
+
if (value === null || value === void 0) return void 0;
|
|
20
|
+
if (typeof value === "string") return {
|
|
21
|
+
value,
|
|
22
|
+
type: "string"
|
|
23
|
+
};
|
|
24
|
+
if (typeof value === "boolean") return {
|
|
25
|
+
value,
|
|
26
|
+
type: "boolean"
|
|
27
|
+
};
|
|
28
|
+
if (typeof value === "number") {
|
|
29
|
+
if (Number.isInteger(value)) return {
|
|
30
|
+
value,
|
|
31
|
+
type: "integer"
|
|
32
|
+
};
|
|
33
|
+
return {
|
|
34
|
+
value,
|
|
35
|
+
type: "double"
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
return {
|
|
39
|
+
value: JSON.stringify(value),
|
|
40
|
+
type: "string"
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
/** Convert a JS value to the OTLP `AnyValue` shape (`stringValue` / `intValue` / `boolValue`). */
|
|
44
|
+
function toOtlpAttributeValue(value) {
|
|
45
|
+
if (typeof value === "boolean") return { boolValue: value };
|
|
46
|
+
if (typeof value === "number" && Number.isInteger(value)) return { intValue: String(value) };
|
|
47
|
+
if (typeof value === "string") return { stringValue: value };
|
|
48
|
+
return { stringValue: JSON.stringify(value) };
|
|
49
|
+
}
|
|
50
|
+
//#endregion
|
|
51
|
+
export { toOtlpAttributeValue as n, toTypedAttributeValue as r, mergeEventField as t };
|
|
52
|
+
|
|
53
|
+
//# sourceMappingURL=event-ef-5Dbxg.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"event-ef-5Dbxg.mjs","names":[],"sources":["../src/shared/event.ts"],"sourcesContent":["/**\n * Helpers for building / mutating wide events from inside enrichers and adapters.\n */\n\n/**\n * Merge a computed value onto an existing event field. By default, existing\n * object values win over computed ones — so `log.set({ geo: ... })` keeps\n * precedence over an enricher's automatic detection.\n */\nexport function mergeEventField<T extends object>(\n existing: unknown,\n computed: T,\n overwrite?: boolean,\n): T {\n if (overwrite || existing === undefined || existing === null || typeof existing !== 'object') {\n return computed\n }\n return { ...computed, ...(existing as T) }\n}\n\n/** Typed attribute used when flattening events for OTLP/Sentry/Datadog/PostHog. */\nexport type AttributeValueKind = 'string' | 'integer' | 'double' | 'boolean'\n\nexport interface TypedAttributeValue {\n value: string | number | boolean\n type: AttributeValueKind\n}\n\n/** Convert a JS value to a {@link TypedAttributeValue}. Objects are JSON-serialized. */\nexport function toTypedAttributeValue(value: unknown): TypedAttributeValue | undefined {\n if (value === null || value === undefined) return undefined\n if (typeof value === 'string') return { value, type: 'string' }\n if (typeof value === 'boolean') return { value, type: 'boolean' }\n if (typeof value === 'number') {\n if (Number.isInteger(value)) return { value, type: 'integer' }\n return { value, type: 'double' }\n }\n return { value: JSON.stringify(value), type: 'string' }\n}\n\n/** Convert a JS value to the OTLP `AnyValue` shape (`stringValue` / `intValue` / `boolValue`). */\nexport function toOtlpAttributeValue(value: unknown): {\n stringValue?: string\n intValue?: string\n boolValue?: boolean\n} {\n if (typeof value === 'boolean') return { boolValue: value }\n if (typeof value === 'number' && Number.isInteger(value)) return { intValue: String(value) }\n if (typeof value === 'string') return { stringValue: value }\n return { stringValue: JSON.stringify(value) }\n}\n"],"mappings":";;;;;;;;;AASA,SAAgB,gBACd,UACA,UACA,WACG;AACH,KAAI,aAAa,aAAa,KAAA,KAAa,aAAa,QAAQ,OAAO,aAAa,SAClF,QAAO;AAET,QAAO;EAAE,GAAG;EAAU,GAAI;EAAgB;;;AAY5C,SAAgB,sBAAsB,OAAiD;AACrF,KAAI,UAAU,QAAQ,UAAU,KAAA,EAAW,QAAO,KAAA;AAClD,KAAI,OAAO,UAAU,SAAU,QAAO;EAAE;EAAO,MAAM;EAAU;AAC/D,KAAI,OAAO,UAAU,UAAW,QAAO;EAAE;EAAO,MAAM;EAAW;AACjE,KAAI,OAAO,UAAU,UAAU;AAC7B,MAAI,OAAO,UAAU,MAAM,CAAE,QAAO;GAAE;GAAO,MAAM;GAAW;AAC9D,SAAO;GAAE;GAAO,MAAM;GAAU;;AAElC,QAAO;EAAE,OAAO,KAAK,UAAU,MAAM;EAAE,MAAM;EAAU;;;AAIzD,SAAgB,qBAAqB,OAInC;AACA,KAAI,OAAO,UAAU,UAAW,QAAO,EAAE,WAAW,OAAO;AAC3D,KAAI,OAAO,UAAU,YAAY,OAAO,UAAU,MAAM,CAAE,QAAO,EAAE,UAAU,OAAO,MAAM,EAAE;AAC5F,KAAI,OAAO,UAAU,SAAU,QAAO,EAAE,aAAa,OAAO;AAC5D,QAAO,EAAE,aAAa,KAAK,UAAU,MAAM,EAAE"}
|
package/dist/express/index.d.mts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Y as RequestLogger } from "../audit-
|
|
2
|
-
import { t as BaseEvlogOptions } from "../middleware-
|
|
1
|
+
import { Y as RequestLogger } from "../audit-CJl-wZ10.mjs";
|
|
2
|
+
import { t as BaseEvlogOptions } from "../middleware-CGM-bOvE.mjs";
|
|
3
3
|
import { RequestHandler } from "express";
|
|
4
4
|
|
|
5
5
|
//#region src/express/index.d.ts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/express/index.ts"],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/express/index.ts"],"mappings":";;;;;cAMiB,SAAA,sBAAS,MAAA,wBAAA,aAAA,CAAA,CAAA;AAAA,KAId,mBAAA,GAAsB,gBAAA;AAAA;EAAA,UAKtB,OAAA;IACR,GAAA,EAAK,aAAA;EAAA;AAAA;;;;;;;;;AANT;;;;;AAEoB;;;;;iBAwCJ,KAAA,CAAM,OAAA,GAAS,mBAAA,GAA2B,cAAA"}
|
package/dist/express/index.mjs
CHANGED
|
@@ -1,9 +1,20 @@
|
|
|
1
|
-
import { t as
|
|
2
|
-
import { t as
|
|
3
|
-
import { n as extractSafeNodeHeaders } from "../headers-D74M0wsg.mjs";
|
|
4
|
-
import { t as createLoggerStorage } from "../storage-CFGTn37X.mjs";
|
|
1
|
+
import { t as defineFrameworkIntegration } from "../integration-Bz8X6_Lb.mjs";
|
|
2
|
+
import { t as createLoggerStorage } from "../storage-BT-3fT1-.mjs";
|
|
5
3
|
//#region src/express/index.ts
|
|
6
4
|
const { storage, useLogger } = createLoggerStorage("middleware context. Make sure app.use(evlog()) is registered before your routes.");
|
|
5
|
+
const integration = defineFrameworkIntegration({
|
|
6
|
+
name: "express",
|
|
7
|
+
extractRequest: (req) => ({
|
|
8
|
+
method: req.method,
|
|
9
|
+
path: new URL(req.originalUrl || req.url || "/", "http://localhost").pathname,
|
|
10
|
+
headers: req.headers,
|
|
11
|
+
requestId: req.get("x-request-id")
|
|
12
|
+
}),
|
|
13
|
+
attachLogger: (req, logger) => {
|
|
14
|
+
req.log = logger;
|
|
15
|
+
},
|
|
16
|
+
storage
|
|
17
|
+
});
|
|
7
18
|
/**
|
|
8
19
|
* Create an evlog middleware for Express.
|
|
9
20
|
*
|
|
@@ -24,24 +35,15 @@ const { storage, useLogger } = createLoggerStorage("middleware context. Make sur
|
|
|
24
35
|
*/
|
|
25
36
|
function evlog(options = {}) {
|
|
26
37
|
return (req, res, next) => {
|
|
27
|
-
const
|
|
28
|
-
method: req.method,
|
|
29
|
-
path: new URL(req.originalUrl || req.url || "/", "http://localhost").pathname,
|
|
30
|
-
requestId: req.get("x-request-id") || crypto.randomUUID(),
|
|
31
|
-
headers: extractSafeNodeHeaders(req.headers),
|
|
32
|
-
...options
|
|
33
|
-
};
|
|
34
|
-
const { logger, finish, skipped } = createMiddlewareLogger(middlewareOpts);
|
|
38
|
+
const { finish, skipped, runWith } = integration.start(req, options);
|
|
35
39
|
if (skipped) {
|
|
36
40
|
next();
|
|
37
41
|
return;
|
|
38
42
|
}
|
|
39
|
-
attachForkToLogger(storage, logger, middlewareOpts);
|
|
40
|
-
req.log = logger;
|
|
41
43
|
res.on("finish", () => {
|
|
42
44
|
finish({ status: res.statusCode }).catch(() => {});
|
|
43
45
|
});
|
|
44
|
-
|
|
46
|
+
runWith(() => next());
|
|
45
47
|
};
|
|
46
48
|
}
|
|
47
49
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","names":[],"sources":["../../src/express/index.ts"],"sourcesContent":["import type { Request, Response, NextFunction, RequestHandler } from 'express'\nimport type { RequestLogger } from '../types'\nimport {
|
|
1
|
+
{"version":3,"file":"index.mjs","names":[],"sources":["../../src/express/index.ts"],"sourcesContent":["import type { Request, Response, NextFunction, RequestHandler } from 'express'\nimport type { RequestLogger } from '../types'\nimport { defineFrameworkIntegration } from '../shared/integration'\nimport type { BaseEvlogOptions } from '../shared/middleware'\nimport { createLoggerStorage } from '../shared/storage'\n\nconst { storage, useLogger } = createLoggerStorage(\n 'middleware context. Make sure app.use(evlog()) is registered before your routes.',\n)\n\nexport type EvlogExpressOptions = BaseEvlogOptions\n\nexport { useLogger }\n\ndeclare module 'express-serve-static-core' {\n interface Request {\n log: RequestLogger\n }\n}\n\nconst integration = defineFrameworkIntegration<Request>({\n name: 'express',\n extractRequest: (req) => ({\n method: req.method,\n path: new URL(req.originalUrl || req.url || '/', 'http://localhost').pathname,\n headers: req.headers,\n requestId: req.get('x-request-id'),\n }),\n attachLogger: (req, logger) => {\n req.log = logger\n },\n storage,\n})\n\n/**\n * Create an evlog middleware for Express.\n *\n * @example\n * ```ts\n * import express from 'express'\n * import { evlog } from 'evlog/express'\n * import { createAxiomDrain } from 'evlog/axiom'\n *\n * const app = express()\n * app.use(evlog({\n * drain: createAxiomDrain(),\n * enrich: (ctx) => {\n * ctx.event.region = process.env.FLY_REGION\n * },\n * }))\n * ```\n */\nexport function evlog(options: EvlogExpressOptions = {}): RequestHandler {\n return (req: Request, res: Response, next: NextFunction) => {\n const { finish, skipped, runWith } = integration.start(req, options)\n\n if (skipped) {\n next()\n return\n }\n\n res.on('finish', () => {\n finish({ status: res.statusCode }).catch(() => {})\n })\n\n void runWith(() => next())\n }\n}\n"],"mappings":";;;AAMA,MAAM,EAAE,SAAS,cAAc,oBAC7B,mFACD;AAYD,MAAM,cAAc,2BAAoC;CACtD,MAAM;CACN,iBAAiB,SAAS;EACxB,QAAQ,IAAI;EACZ,MAAM,IAAI,IAAI,IAAI,eAAe,IAAI,OAAO,KAAK,mBAAmB,CAAC;EACrE,SAAS,IAAI;EACb,WAAW,IAAI,IAAI,eAAe;EACnC;CACD,eAAe,KAAK,WAAW;AAC7B,MAAI,MAAM;;CAEZ;CACD,CAAC;;;;;;;;;;;;;;;;;;;AAoBF,SAAgB,MAAM,UAA+B,EAAE,EAAkB;AACvE,SAAQ,KAAc,KAAe,SAAuB;EAC1D,MAAM,EAAE,QAAQ,SAAS,YAAY,YAAY,MAAM,KAAK,QAAQ;AAEpE,MAAI,SAAS;AACX,SAAM;AACN;;AAGF,MAAI,GAAG,gBAAgB;AACrB,UAAO,EAAE,QAAQ,IAAI,YAAY,CAAC,CAAC,YAAY,GAAG;IAClD;AAEG,gBAAc,MAAM,CAAC"}
|
package/dist/fastify/index.d.mts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Y as RequestLogger } from "../audit-
|
|
2
|
-
import { t as BaseEvlogOptions } from "../middleware-
|
|
1
|
+
import { Y as RequestLogger } from "../audit-CJl-wZ10.mjs";
|
|
2
|
+
import { t as BaseEvlogOptions } from "../middleware-CGM-bOvE.mjs";
|
|
3
3
|
import { FastifyPluginCallback } from "fastify";
|
|
4
4
|
|
|
5
5
|
//#region src/fastify/index.d.ts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/fastify/index.ts"],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/fastify/index.ts"],"mappings":";;;;;cAKiB,SAAA,sBAAS,MAAA,wBAAA,aAAA,CAAA,CAAA;AAAA,KAId,mBAAA,GAAsB,gBAAA;AAAA;EAAA,UAKtB,cAAA;IAER,GAAA;EAAA;AAAA;;;;;;;;;;;AAPJ;;;;;AAEoB;;;;;;cAsFP,KAAA,EAAK,qBAAA,CAAA,gBAAA"}
|
package/dist/fastify/index.mjs
CHANGED
|
@@ -1,32 +1,31 @@
|
|
|
1
|
-
import { t as
|
|
2
|
-
import { t as
|
|
3
|
-
import { n as extractSafeNodeHeaders } from "../headers-D74M0wsg.mjs";
|
|
4
|
-
import { t as createLoggerStorage } from "../storage-CFGTn37X.mjs";
|
|
1
|
+
import { t as defineFrameworkIntegration } from "../integration-Bz8X6_Lb.mjs";
|
|
2
|
+
import { t as createLoggerStorage } from "../storage-BT-3fT1-.mjs";
|
|
5
3
|
//#region src/fastify/index.ts
|
|
6
4
|
const { storage, useLogger } = createLoggerStorage("plugin context. Make sure app.register(evlog) is called before your routes.");
|
|
5
|
+
const integration = defineFrameworkIntegration({
|
|
6
|
+
name: "fastify",
|
|
7
|
+
extractRequest: (req) => ({
|
|
8
|
+
method: req.method,
|
|
9
|
+
path: new URL(req.url, "http://localhost").pathname,
|
|
10
|
+
headers: req.headers,
|
|
11
|
+
requestId: typeof req.headers["x-request-id"] === "string" ? req.headers["x-request-id"] : void 0
|
|
12
|
+
}),
|
|
13
|
+
attachLogger: (req, logger) => {
|
|
14
|
+
req.log = logger;
|
|
15
|
+
},
|
|
16
|
+
storage
|
|
17
|
+
});
|
|
7
18
|
const evlogPlugin = (fastify, options, done) => {
|
|
8
19
|
const emitted = /* @__PURE__ */ new WeakSet();
|
|
9
20
|
const requestState = /* @__PURE__ */ new WeakMap();
|
|
10
|
-
fastify.addHook("onRequest", (request, _reply,
|
|
11
|
-
const
|
|
12
|
-
const path = new URL(request.url, "http://localhost").pathname;
|
|
13
|
-
const middlewareOpts = {
|
|
14
|
-
method: request.method,
|
|
15
|
-
path,
|
|
16
|
-
requestId: headers["x-request-id"] || crypto.randomUUID(),
|
|
17
|
-
headers,
|
|
18
|
-
...options
|
|
19
|
-
};
|
|
20
|
-
const { logger, finish, skipped } = createMiddlewareLogger(middlewareOpts);
|
|
21
|
+
fastify.addHook("onRequest", (request, _reply, next) => {
|
|
22
|
+
const { finish, skipped, runWith } = integration.start(request, options);
|
|
21
23
|
if (skipped) {
|
|
22
|
-
|
|
24
|
+
next();
|
|
23
25
|
return;
|
|
24
26
|
}
|
|
25
|
-
attachForkToLogger(storage, logger, middlewareOpts);
|
|
26
|
-
const req = request;
|
|
27
|
-
req.log = logger;
|
|
28
27
|
requestState.set(request, { finish });
|
|
29
|
-
|
|
28
|
+
runWith(() => next());
|
|
30
29
|
});
|
|
31
30
|
fastify.addHook("onResponse", async (request, reply) => {
|
|
32
31
|
const state = requestState.get(request);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","names":[],"sources":["../../src/fastify/index.ts"],"sourcesContent":["import type { FastifyPluginCallback } from 'fastify'\nimport {
|
|
1
|
+
{"version":3,"file":"index.mjs","names":[],"sources":["../../src/fastify/index.ts"],"sourcesContent":["import type { FastifyPluginCallback, FastifyRequest } from 'fastify'\nimport { defineFrameworkIntegration } from '../shared/integration'\nimport type { BaseEvlogOptions } from '../shared/middleware'\nimport { createLoggerStorage } from '../shared/storage'\n\nconst { storage, useLogger } = createLoggerStorage(\n 'plugin context. Make sure app.register(evlog) is called before your routes.',\n)\n\nexport type EvlogFastifyOptions = BaseEvlogOptions\n\nexport { useLogger }\n\ndeclare module 'fastify' {\n interface FastifyRequest {\n // Overrides Fastify's built-in pino logger on the request with evlog's RequestLogger.\n log: any\n }\n}\n\ninterface RequestState {\n finish: (opts?: { status?: number; error?: Error }) => Promise<unknown>\n}\n\nconst integration = defineFrameworkIntegration<FastifyRequest>({\n name: 'fastify',\n extractRequest: (req) => ({\n method: req.method,\n path: new URL(req.url, 'http://localhost').pathname,\n headers: req.headers,\n requestId: typeof req.headers['x-request-id'] === 'string' ? req.headers['x-request-id'] : undefined,\n }),\n attachLogger: (req, logger) => {\n (req as any).log = logger\n },\n storage,\n})\n\nconst evlogPlugin: FastifyPluginCallback<EvlogFastifyOptions> = (fastify, options, done) => {\n const emitted = new WeakSet<object>()\n const requestState = new WeakMap<object, RequestState>()\n\n fastify.addHook('onRequest', (request, _reply, next) => {\n const { finish, skipped, runWith } = integration.start(request, options)\n if (skipped) {\n next()\n return\n }\n requestState.set(request, { finish })\n void runWith(() => next())\n })\n\n fastify.addHook('onResponse', async (request, reply) => {\n const state = requestState.get(request)\n if (!state || emitted.has(request)) return\n emitted.add(request)\n await state.finish({ status: reply.statusCode })\n })\n\n fastify.addHook('onError', async (request, _reply, error) => {\n const state = requestState.get(request)\n if (!state || emitted.has(request)) return\n emitted.add(request)\n const logger = (request as any).log\n const err = error instanceof Error ? error : new Error(String(error))\n if (logger && typeof logger.error === 'function') logger.error(err)\n await state.finish({ error: err })\n })\n\n done()\n}\n\nconst plugin = evlogPlugin as any\nplugin[Symbol.for('skip-override')] = true\nplugin[Symbol.for('fastify.display-name')] = 'evlog'\n\n/**\n * Create an evlog plugin for Fastify.\n *\n * @example\n * ```ts\n * import Fastify from 'fastify'\n * import { initLogger } from 'evlog'\n * import { evlog } from 'evlog/fastify'\n * import { createAxiomDrain } from 'evlog/axiom'\n *\n * initLogger({ env: { service: 'fastify-api' } })\n *\n * const app = Fastify()\n * await app.register(evlog, {\n * drain: createAxiomDrain(),\n * enrich: (ctx) => {\n * ctx.event.region = process.env.FLY_REGION\n * },\n * })\n * ```\n */\nexport const evlog = evlogPlugin\n"],"mappings":";;;AAKA,MAAM,EAAE,SAAS,cAAc,oBAC7B,8EACD;AAiBD,MAAM,cAAc,2BAA2C;CAC7D,MAAM;CACN,iBAAiB,SAAS;EACxB,QAAQ,IAAI;EACZ,MAAM,IAAI,IAAI,IAAI,KAAK,mBAAmB,CAAC;EAC3C,SAAS,IAAI;EACb,WAAW,OAAO,IAAI,QAAQ,oBAAoB,WAAW,IAAI,QAAQ,kBAAkB,KAAA;EAC5F;CACD,eAAe,KAAK,WAAW;AAC5B,MAAY,MAAM;;CAErB;CACD,CAAC;AAEF,MAAM,eAA2D,SAAS,SAAS,SAAS;CAC1F,MAAM,0BAAU,IAAI,SAAiB;CACrC,MAAM,+BAAe,IAAI,SAA+B;AAExD,SAAQ,QAAQ,cAAc,SAAS,QAAQ,SAAS;EACtD,MAAM,EAAE,QAAQ,SAAS,YAAY,YAAY,MAAM,SAAS,QAAQ;AACxE,MAAI,SAAS;AACX,SAAM;AACN;;AAEF,eAAa,IAAI,SAAS,EAAE,QAAQ,CAAC;AAChC,gBAAc,MAAM,CAAC;GAC1B;AAEF,SAAQ,QAAQ,cAAc,OAAO,SAAS,UAAU;EACtD,MAAM,QAAQ,aAAa,IAAI,QAAQ;AACvC,MAAI,CAAC,SAAS,QAAQ,IAAI,QAAQ,CAAE;AACpC,UAAQ,IAAI,QAAQ;AACpB,QAAM,MAAM,OAAO,EAAE,QAAQ,MAAM,YAAY,CAAC;GAChD;AAEF,SAAQ,QAAQ,WAAW,OAAO,SAAS,QAAQ,UAAU;EAC3D,MAAM,QAAQ,aAAa,IAAI,QAAQ;AACvC,MAAI,CAAC,SAAS,QAAQ,IAAI,QAAQ,CAAE;AACpC,UAAQ,IAAI,QAAQ;EACpB,MAAM,SAAU,QAAgB;EAChC,MAAM,MAAM,iBAAiB,QAAQ,QAAQ,IAAI,MAAM,OAAO,MAAM,CAAC;AACrE,MAAI,UAAU,OAAO,OAAO,UAAU,WAAY,QAAO,MAAM,IAAI;AACnE,QAAM,MAAM,OAAO,EAAE,OAAO,KAAK,CAAC;GAClC;AAEF,OAAM;;AAGR,MAAM,SAAS;AACf,OAAO,OAAO,IAAI,gBAAgB,IAAI;AACtC,OAAO,OAAO,IAAI,uBAAuB,IAAI;;;;;;;;;;;;;;;;;;;;;;AAuB7C,MAAa,QAAQ"}
|
|
@@ -0,0 +1,227 @@
|
|
|
1
|
+
import { M as resolveRedactConfig, T as createPluginRunner, g as createRequestLogger, j as redactEvent, k as getEmptyPluginRunner, v as getGlobalDrain, w as shouldKeep, x as isEnabled, y as getGlobalPluginRunner } from "./audit--n0QRR2Y.mjs";
|
|
2
|
+
import { t as extractErrorStatus } from "./errors-BQgyQ9xe.mjs";
|
|
3
|
+
import { n as shouldLog, t as getServiceForPath } from "./routes-B48wm7Pb.mjs";
|
|
4
|
+
//#region src/shared/middleware.ts
|
|
5
|
+
const noopResult = {
|
|
6
|
+
logger: {
|
|
7
|
+
set() {},
|
|
8
|
+
error() {},
|
|
9
|
+
info() {},
|
|
10
|
+
warn() {},
|
|
11
|
+
emit() {
|
|
12
|
+
return null;
|
|
13
|
+
},
|
|
14
|
+
getContext() {
|
|
15
|
+
return {};
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
finish: () => Promise.resolve(null),
|
|
19
|
+
skipped: true
|
|
20
|
+
};
|
|
21
|
+
const runnerCache = /* @__PURE__ */ new WeakMap();
|
|
22
|
+
/**
|
|
23
|
+
* Resolve the plugin runner for a middleware invocation by merging local
|
|
24
|
+
* plugins with the globally-registered ones (deduplicated by `name`).
|
|
25
|
+
*/
|
|
26
|
+
function resolveMiddlewarePluginRunner(options) {
|
|
27
|
+
const global = getGlobalPluginRunner();
|
|
28
|
+
const local = options.plugins;
|
|
29
|
+
if (!local || local.length === 0) return global;
|
|
30
|
+
const cached = runnerCache.get(local);
|
|
31
|
+
if (cached && cached.global === global) return cached.merged;
|
|
32
|
+
const merged = /* @__PURE__ */ new Map();
|
|
33
|
+
for (const plugin of global.plugins) merged.set(plugin.name, plugin);
|
|
34
|
+
for (const plugin of local) merged.set(plugin.name, plugin);
|
|
35
|
+
if (merged.size === 0) return getEmptyPluginRunner();
|
|
36
|
+
const runner = createPluginRunner(Array.from(merged.values()));
|
|
37
|
+
runnerCache.set(local, {
|
|
38
|
+
global,
|
|
39
|
+
merged: runner
|
|
40
|
+
});
|
|
41
|
+
return runner;
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Apply redact, enrich, and drain to an emitted wide event — the same
|
|
45
|
+
* pipeline used by {@link createMiddlewareLogger}'s `finish`.
|
|
46
|
+
*/
|
|
47
|
+
async function runEnrichAndDrain(emittedEvent, options, requestInfo, responseStatus, plugins) {
|
|
48
|
+
const runner = plugins ?? resolveMiddlewarePluginRunner(options);
|
|
49
|
+
const resolvedRedact = resolveRedactConfig(options.redact);
|
|
50
|
+
if (resolvedRedact) redactEvent(emittedEvent, resolvedRedact);
|
|
51
|
+
if (options.enrich || runner.hasEnrich) {
|
|
52
|
+
const enrichCtx = {
|
|
53
|
+
event: emittedEvent,
|
|
54
|
+
request: requestInfo,
|
|
55
|
+
headers: options.headers,
|
|
56
|
+
response: { status: responseStatus }
|
|
57
|
+
};
|
|
58
|
+
if (options.enrich) try {
|
|
59
|
+
await options.enrich(enrichCtx);
|
|
60
|
+
} catch (err) {
|
|
61
|
+
console.error("[evlog] enrich failed:", err);
|
|
62
|
+
}
|
|
63
|
+
if (runner.hasEnrich) await runner.runEnrich(enrichCtx);
|
|
64
|
+
}
|
|
65
|
+
const drain = options.drain ?? getGlobalDrain();
|
|
66
|
+
const hasUserDrain = !!drain;
|
|
67
|
+
const hasPluginDrain = runner.hasDrain;
|
|
68
|
+
if (hasUserDrain || hasPluginDrain) {
|
|
69
|
+
const drainCtx = {
|
|
70
|
+
event: emittedEvent,
|
|
71
|
+
request: requestInfo,
|
|
72
|
+
headers: options.headers
|
|
73
|
+
};
|
|
74
|
+
const tasks = [];
|
|
75
|
+
if (hasUserDrain) tasks.push((async () => {
|
|
76
|
+
try {
|
|
77
|
+
await drain(drainCtx);
|
|
78
|
+
} catch (err) {
|
|
79
|
+
console.error("[evlog] drain failed:", err);
|
|
80
|
+
}
|
|
81
|
+
})());
|
|
82
|
+
if (hasPluginDrain) tasks.push(runner.runDrain(drainCtx));
|
|
83
|
+
await Promise.all(tasks);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Create a request logger with the full middleware pipeline: route filtering,
|
|
88
|
+
* service overrides, duration tracking, tail sampling, emit, enrich, drain.
|
|
89
|
+
*
|
|
90
|
+
* Framework adapters extract method/path/requestId/headers, call this once
|
|
91
|
+
* per request, and call `finish({ status | error })` when the response ends.
|
|
92
|
+
* If `skipped` is `true`, the route was filtered out — bypass logging.
|
|
93
|
+
*/
|
|
94
|
+
function createMiddlewareLogger(options) {
|
|
95
|
+
if (!isEnabled()) return noopResult;
|
|
96
|
+
const { method, path, requestId, include, exclude, routes, keep } = options;
|
|
97
|
+
if (!shouldLog(path, include, exclude)) return noopResult;
|
|
98
|
+
const resolvedRequestId = requestId || crypto.randomUUID();
|
|
99
|
+
const logger = createRequestLogger({
|
|
100
|
+
method,
|
|
101
|
+
path,
|
|
102
|
+
requestId: resolvedRequestId
|
|
103
|
+
}, { _deferDrain: true });
|
|
104
|
+
const routeService = getServiceForPath(path, routes);
|
|
105
|
+
if (routeService) logger.set({ service: routeService });
|
|
106
|
+
const pluginRunner = resolveMiddlewarePluginRunner(options);
|
|
107
|
+
if (pluginRunner.hasExtendLogger) pluginRunner.applyExtendLogger(logger);
|
|
108
|
+
const startTime = Date.now();
|
|
109
|
+
const requestInfo = {
|
|
110
|
+
method,
|
|
111
|
+
path,
|
|
112
|
+
requestId: resolvedRequestId
|
|
113
|
+
};
|
|
114
|
+
if (pluginRunner.hasRequestLifecycle) pluginRunner.runOnRequestStart({
|
|
115
|
+
logger,
|
|
116
|
+
request: requestInfo,
|
|
117
|
+
headers: options.headers
|
|
118
|
+
});
|
|
119
|
+
const finish = async (opts) => {
|
|
120
|
+
const { status, error } = opts ?? {};
|
|
121
|
+
if (error) {
|
|
122
|
+
logger.error(error);
|
|
123
|
+
const errorStatus = extractErrorStatus(error);
|
|
124
|
+
logger.set({ status: errorStatus });
|
|
125
|
+
} else if (status !== void 0) logger.set({ status });
|
|
126
|
+
const durationMs = Date.now() - startTime;
|
|
127
|
+
const resolvedStatus = error ? extractErrorStatus(error) : status ?? logger.getContext().status;
|
|
128
|
+
const tailCtx = {
|
|
129
|
+
status: resolvedStatus,
|
|
130
|
+
duration: durationMs,
|
|
131
|
+
path,
|
|
132
|
+
method,
|
|
133
|
+
context: logger.getContext(),
|
|
134
|
+
shouldKeep: false
|
|
135
|
+
};
|
|
136
|
+
if (keep) await keep(tailCtx);
|
|
137
|
+
if (pluginRunner.hasKeep) await pluginRunner.runKeep(tailCtx);
|
|
138
|
+
const forceKeep = tailCtx.shouldKeep || shouldKeep(tailCtx);
|
|
139
|
+
const emittedEvent = logger.emit({ _forceKeep: forceKeep });
|
|
140
|
+
if (emittedEvent && (options.enrich || options.drain || pluginRunner.hasEnrich || pluginRunner.hasDrain || getGlobalDrain())) await runEnrichAndDrain(emittedEvent, options, requestInfo, resolvedStatus, pluginRunner);
|
|
141
|
+
if (pluginRunner.hasRequestLifecycle) pluginRunner.runOnRequestFinish({
|
|
142
|
+
logger,
|
|
143
|
+
request: requestInfo,
|
|
144
|
+
headers: options.headers,
|
|
145
|
+
event: emittedEvent,
|
|
146
|
+
status: resolvedStatus,
|
|
147
|
+
durationMs,
|
|
148
|
+
error
|
|
149
|
+
});
|
|
150
|
+
return emittedEvent;
|
|
151
|
+
};
|
|
152
|
+
return {
|
|
153
|
+
logger,
|
|
154
|
+
finish,
|
|
155
|
+
skipped: false
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
//#endregion
|
|
159
|
+
//#region src/shared/fork.ts
|
|
160
|
+
/**
|
|
161
|
+
* Attach {@link RequestLogger.fork} to a request logger. Replaces any existing `fork`.
|
|
162
|
+
*/
|
|
163
|
+
function attachForkToLogger(storage, parent, middlewareOptions, lifecycle) {
|
|
164
|
+
const log = parent;
|
|
165
|
+
log.fork = (label, fn) => {
|
|
166
|
+
forkBackgroundLogger({
|
|
167
|
+
storage,
|
|
168
|
+
parent,
|
|
169
|
+
middlewareOptions,
|
|
170
|
+
label,
|
|
171
|
+
fn,
|
|
172
|
+
lifecycle
|
|
173
|
+
});
|
|
174
|
+
};
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* Run background work under a child request logger so `useLogger()` resolves to the
|
|
178
|
+
* child while `fn` runs. The child emits a separate wide event when `fn` settles,
|
|
179
|
+
* with `operation` and `_parentRequestId` set for correlation.
|
|
180
|
+
*
|
|
181
|
+
* @beta Part of `evlog/toolkit` — used by framework integrations; prefer `log.fork()`
|
|
182
|
+
* on the request logger when available.
|
|
183
|
+
*/
|
|
184
|
+
function forkBackgroundLogger(options) {
|
|
185
|
+
const { storage, parent, middlewareOptions, label, fn, lifecycle } = options;
|
|
186
|
+
const parentCtx = parent.getContext();
|
|
187
|
+
const parentRequestId = parentCtx.requestId;
|
|
188
|
+
if (typeof parentRequestId !== "string" || parentRequestId.length === 0) throw new Error("[evlog] log.fork() requires the parent logger to have a requestId. Ensure the request was created by evlog middleware.");
|
|
189
|
+
const method = String(parentCtx.method ?? middlewareOptions.method);
|
|
190
|
+
const path = String(parentCtx.path ?? middlewareOptions.path);
|
|
191
|
+
const child = createRequestLogger({
|
|
192
|
+
method,
|
|
193
|
+
path,
|
|
194
|
+
requestId: crypto.randomUUID()
|
|
195
|
+
}, { _deferDrain: true });
|
|
196
|
+
child.set({
|
|
197
|
+
operation: label,
|
|
198
|
+
_parentRequestId: parentRequestId
|
|
199
|
+
});
|
|
200
|
+
const childRequestInfo = {
|
|
201
|
+
method,
|
|
202
|
+
path,
|
|
203
|
+
requestId: child.getContext().requestId
|
|
204
|
+
};
|
|
205
|
+
storage.run(child, () => {
|
|
206
|
+
lifecycle?.onChildEnter?.(child);
|
|
207
|
+
Promise.resolve().then(() => fn()).then(async () => {
|
|
208
|
+
const emittedEvent = child.emit();
|
|
209
|
+
const ctxStatus = child.getContext().status;
|
|
210
|
+
const status = emittedEvent?.status ?? (typeof ctxStatus === "number" ? ctxStatus : void 0);
|
|
211
|
+
if (emittedEvent && (middlewareOptions.enrich || middlewareOptions.drain || getGlobalDrain())) await runEnrichAndDrain(emittedEvent, middlewareOptions, childRequestInfo, status);
|
|
212
|
+
}).catch(async (err) => {
|
|
213
|
+
const error = err instanceof Error ? err : new Error(String(err));
|
|
214
|
+
child.error(error);
|
|
215
|
+
child.set({ status: extractErrorStatus(error) });
|
|
216
|
+
const emittedEvent = child.emit();
|
|
217
|
+
const status = extractErrorStatus(error);
|
|
218
|
+
if (emittedEvent && (middlewareOptions.enrich || middlewareOptions.drain || getGlobalDrain())) await runEnrichAndDrain(emittedEvent, middlewareOptions, childRequestInfo, status);
|
|
219
|
+
}).finally(() => {
|
|
220
|
+
lifecycle?.onChildExit?.(child);
|
|
221
|
+
});
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
//#endregion
|
|
225
|
+
export { runEnrichAndDrain as a, resolveMiddlewarePluginRunner as i, forkBackgroundLogger as n, createMiddlewareLogger as r, attachForkToLogger as t };
|
|
226
|
+
|
|
227
|
+
//# sourceMappingURL=fork-D44V93-K.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fork-D44V93-K.mjs","names":[],"sources":["../src/shared/middleware.ts","../src/shared/fork.ts"],"sourcesContent":["import type { DrainContext, EnrichContext, RedactConfig, RequestLogger, RouteConfig, TailSamplingContext, WideEvent } from '../types'\nimport { createRequestLogger, getGlobalDrain, getGlobalPluginRunner, isEnabled, shouldKeep } from '../logger'\nimport { redactEvent, resolveRedactConfig } from '../redact'\nimport { extractErrorStatus } from './errors'\nimport type { EvlogPlugin, PluginRunner } from './plugin'\nimport { createPluginRunner, getEmptyPluginRunner } from './plugin'\nimport { shouldLog, getServiceForPath } from './routes'\n\n/**\n * Base options shared by every framework integration. Re-exported via\n * `evlog/toolkit` so custom integrations can extend it.\n */\nexport interface BaseEvlogOptions {\n /** Route glob patterns to include. If unset, all routes are logged. */\n include?: string[]\n /** Route glob patterns to exclude. Takes precedence over `include`. */\n exclude?: string[]\n /** Per-route service overrides. */\n routes?: Record<string, RouteConfig>\n /** Drain callback invoked with every emitted event. */\n drain?: (ctx: DrainContext) => void | Promise<void>\n /** Enrich callback invoked after emit, before drain. */\n enrich?: (ctx: EnrichContext) => void | Promise<void>\n /** Tail sampling callback. Set `ctx.shouldKeep = true` to force-keep. */\n keep?: (ctx: TailSamplingContext) => void | Promise<void>\n /**\n * PII auto-redaction. `true` enables built-in patterns; pass an object for\n * fine-grained control. Applied before enrich/drain.\n */\n redact?: boolean | RedactConfig\n /** Plugins for this middleware, merged with globally-registered ones. */\n plugins?: EvlogPlugin[]\n}\n\n/** Internal options accepted by `createMiddlewareLogger`. */\nexport interface MiddlewareLoggerOptions extends BaseEvlogOptions {\n method: string\n path: string\n requestId?: string\n /** Pre-filtered safe request headers used for enrich/drain context. */\n headers?: Record<string, string>\n}\n\nexport interface MiddlewareLoggerResult {\n logger: RequestLogger\n finish: (opts?: { status?: number; error?: Error }) => Promise<WideEvent | null>\n skipped: boolean\n}\n\nconst noopResult: MiddlewareLoggerResult = {\n logger: {\n set() {},\n error() {},\n info() {},\n warn() {},\n emit() {\n return null \n },\n getContext() {\n return {} \n },\n },\n finish: () => Promise.resolve(null),\n skipped: true,\n}\n\n// Memoizes the merged runner per local plugins array (stable across requests\n// because it lives in the middleware factory closure). Invalidated when\n// `initLogger` swaps the global runner, so the merge cost is paid once.\nconst runnerCache = new WeakMap<EvlogPlugin[], { global: PluginRunner; merged: PluginRunner }>()\n\n/**\n * Resolve the plugin runner for a middleware invocation by merging local\n * plugins with the globally-registered ones (deduplicated by `name`).\n */\nexport function resolveMiddlewarePluginRunner(options: { plugins?: EvlogPlugin[] }): PluginRunner {\n const global = getGlobalPluginRunner()\n const local = options.plugins\n if (!local || local.length === 0) return global\n\n const cached = runnerCache.get(local)\n if (cached && cached.global === global) return cached.merged\n\n const merged = new Map<string, EvlogPlugin>()\n for (const plugin of global.plugins) merged.set(plugin.name, plugin)\n for (const plugin of local) merged.set(plugin.name, plugin)\n if (merged.size === 0) return getEmptyPluginRunner()\n\n const runner = createPluginRunner(Array.from(merged.values()))\n runnerCache.set(local, { global, merged: runner })\n return runner\n}\n\n/**\n * Apply redact, enrich, and drain to an emitted wide event — the same\n * pipeline used by {@link createMiddlewareLogger}'s `finish`.\n */\n// eslint-disable-next-line max-params\nexport async function runEnrichAndDrain(\n emittedEvent: WideEvent,\n options: MiddlewareLoggerOptions,\n requestInfo: { method: string; path: string; requestId?: string },\n responseStatus?: number,\n plugins?: PluginRunner,\n): Promise<void> {\n const runner = plugins ?? resolveMiddlewarePluginRunner(options)\n const resolvedRedact = resolveRedactConfig(options.redact)\n if (resolvedRedact) {\n redactEvent(emittedEvent, resolvedRedact)\n }\n\n if (options.enrich || runner.hasEnrich) {\n const enrichCtx: EnrichContext = {\n event: emittedEvent,\n request: requestInfo,\n headers: options.headers,\n response: { status: responseStatus },\n }\n if (options.enrich) {\n try {\n await options.enrich(enrichCtx)\n } catch (err) {\n console.error('[evlog] enrich failed:', err)\n }\n }\n if (runner.hasEnrich) {\n await runner.runEnrich(enrichCtx)\n }\n }\n\n const drain = options.drain ?? getGlobalDrain()\n const hasUserDrain = !!drain\n const hasPluginDrain = runner.hasDrain\n if (hasUserDrain || hasPluginDrain) {\n const drainCtx: DrainContext = {\n event: emittedEvent,\n request: requestInfo,\n headers: options.headers,\n }\n const tasks: Array<Promise<unknown>> = []\n if (hasUserDrain) {\n tasks.push(\n (async () => {\n try {\n await drain!(drainCtx)\n } catch (err) {\n console.error('[evlog] drain failed:', err)\n }\n })(),\n )\n }\n if (hasPluginDrain) {\n tasks.push(runner.runDrain(drainCtx))\n }\n await Promise.all(tasks)\n }\n}\n\n/**\n * Create a request logger with the full middleware pipeline: route filtering,\n * service overrides, duration tracking, tail sampling, emit, enrich, drain.\n *\n * Framework adapters extract method/path/requestId/headers, call this once\n * per request, and call `finish({ status | error })` when the response ends.\n * If `skipped` is `true`, the route was filtered out — bypass logging.\n */\nexport function createMiddlewareLogger(options: MiddlewareLoggerOptions): MiddlewareLoggerResult {\n if (!isEnabled()) return noopResult\n\n const { method, path, requestId, include, exclude, routes, keep } = options\n\n if (!shouldLog(path, include, exclude)) {\n return noopResult\n }\n\n const resolvedRequestId = requestId || crypto.randomUUID()\n\n const logger = createRequestLogger({\n method,\n path,\n requestId: resolvedRequestId,\n }, { _deferDrain: true })\n\n const routeService = getServiceForPath(path, routes)\n if (routeService) {\n logger.set({ service: routeService })\n }\n\n const pluginRunner = resolveMiddlewarePluginRunner(options)\n if (pluginRunner.hasExtendLogger) {\n pluginRunner.applyExtendLogger(logger)\n }\n\n const startTime = Date.now()\n const requestInfo = { method, path, requestId: resolvedRequestId }\n\n if (pluginRunner.hasRequestLifecycle) {\n pluginRunner.runOnRequestStart({\n logger,\n request: requestInfo,\n headers: options.headers,\n })\n }\n\n const finish = async (opts?: { status?: number; error?: Error }): Promise<WideEvent | null> => {\n const { status, error } = opts ?? {}\n\n if (error) {\n logger.error(error)\n const errorStatus = extractErrorStatus(error)\n logger.set({ status: errorStatus })\n } else if (status !== undefined) {\n logger.set({ status })\n }\n\n const durationMs = Date.now() - startTime\n\n const resolvedStatus = error\n ? extractErrorStatus(error)\n : status ?? (logger.getContext().status as number | undefined)\n\n const tailCtx: TailSamplingContext = {\n status: resolvedStatus,\n duration: durationMs,\n path,\n method,\n context: logger.getContext(),\n shouldKeep: false,\n }\n\n if (keep) {\n await keep(tailCtx)\n }\n if (pluginRunner.hasKeep) {\n await pluginRunner.runKeep(tailCtx)\n }\n\n const forceKeep = tailCtx.shouldKeep || shouldKeep(tailCtx)\n const emittedEvent = logger.emit({ _forceKeep: forceKeep })\n\n if (\n emittedEvent\n && (options.enrich || options.drain || pluginRunner.hasEnrich || pluginRunner.hasDrain || getGlobalDrain())\n ) {\n await runEnrichAndDrain(emittedEvent, options, requestInfo, resolvedStatus, pluginRunner)\n }\n\n if (pluginRunner.hasRequestLifecycle) {\n pluginRunner.runOnRequestFinish({\n logger,\n request: requestInfo,\n headers: options.headers,\n event: emittedEvent,\n status: resolvedStatus,\n durationMs,\n error,\n })\n }\n\n return emittedEvent\n }\n\n return { logger, finish, skipped: false }\n}\n","import type { AsyncLocalStorage } from 'node:async_hooks'\nimport type { RequestLogger } from '../types'\nimport { createRequestLogger, getGlobalDrain } from '../logger'\nimport { extractErrorStatus } from './errors'\nimport type { MiddlewareLoggerOptions } from './middleware'\nimport { runEnrichAndDrain } from './middleware'\n\n/**\n * Optional hooks for integrations that track active loggers (e.g. Elysia `activeLoggers`).\n */\nexport interface ForkLifecycle {\n /** Called after the child logger is installed in storage, before `fn` runs. */\n onChildEnter?: (child: RequestLogger) => void\n /** Called after the child has finished (emit + enrich/drain), success or failure. */\n onChildExit?: (child: RequestLogger) => void\n}\n\n/**\n * Options for {@link forkBackgroundLogger}.\n *\n * @beta Part of `evlog/toolkit`\n */\nexport interface ForkBackgroundLoggerOptions {\n storage: AsyncLocalStorage<RequestLogger>\n parent: RequestLogger\n middlewareOptions: MiddlewareLoggerOptions\n label: string\n fn: () => void | Promise<void>\n lifecycle?: ForkLifecycle\n}\n\n/**\n * Attach {@link RequestLogger.fork} to a request logger. Replaces any existing `fork`.\n */\nexport function attachForkToLogger(\n storage: AsyncLocalStorage<RequestLogger>,\n parent: RequestLogger,\n middlewareOptions: MiddlewareLoggerOptions,\n lifecycle?: ForkLifecycle,\n): void {\n const log = parent as RequestLogger & { fork?: (label: string, fn: () => void | Promise<void>) => void }\n log.fork = (label: string, fn: () => void | Promise<void>) => {\n forkBackgroundLogger({ storage, parent, middlewareOptions, label, fn, lifecycle })\n }\n}\n\n/**\n * Run background work under a child request logger so `useLogger()` resolves to the\n * child while `fn` runs. The child emits a separate wide event when `fn` settles,\n * with `operation` and `_parentRequestId` set for correlation.\n *\n * @beta Part of `evlog/toolkit` — used by framework integrations; prefer `log.fork()`\n * on the request logger when available.\n */\nexport function forkBackgroundLogger(options: ForkBackgroundLoggerOptions): void {\n const { storage, parent, middlewareOptions, label, fn, lifecycle } = options\n\n const parentCtx = parent.getContext() as Record<string, unknown>\n const parentRequestId = parentCtx.requestId\n if (typeof parentRequestId !== 'string' || parentRequestId.length === 0) {\n throw new Error(\n '[evlog] log.fork() requires the parent logger to have a requestId. '\n + 'Ensure the request was created by evlog middleware.',\n )\n }\n\n const method = String(parentCtx.method ?? middlewareOptions.method)\n const path = String(parentCtx.path ?? middlewareOptions.path)\n\n const child = createRequestLogger(\n {\n method,\n path,\n requestId: crypto.randomUUID(),\n },\n { _deferDrain: true },\n )\n\n child.set({\n operation: label,\n _parentRequestId: parentRequestId,\n })\n\n const childRequestInfo = {\n method,\n path,\n requestId: child.getContext().requestId as string,\n }\n\n storage.run(child, () => {\n lifecycle?.onChildEnter?.(child)\n void Promise.resolve()\n .then(() => fn())\n .then(async () => {\n const emittedEvent = child.emit()\n const ctxStatus = child.getContext().status\n const status = (emittedEvent?.status\n ?? (typeof ctxStatus === 'number' ? ctxStatus : undefined)) as number | undefined\n if (\n emittedEvent\n && (middlewareOptions.enrich || middlewareOptions.drain || getGlobalDrain())\n ) {\n await runEnrichAndDrain(emittedEvent, middlewareOptions, childRequestInfo, status)\n }\n })\n .catch(async (err: unknown) => {\n const error = err instanceof Error ? err : new Error(String(err))\n child.error(error)\n child.set({ status: extractErrorStatus(error) })\n const emittedEvent = child.emit()\n const status = extractErrorStatus(error)\n if (\n emittedEvent\n && (middlewareOptions.enrich || middlewareOptions.drain || getGlobalDrain())\n ) {\n await runEnrichAndDrain(emittedEvent, middlewareOptions, childRequestInfo, status)\n }\n })\n .finally(() => {\n lifecycle?.onChildExit?.(child)\n })\n })\n}\n"],"mappings":"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"}
|
|
@@ -24,7 +24,24 @@ function extractSafeNodeHeaders(headers) {
|
|
|
24
24
|
}
|
|
25
25
|
return filterSafeHeaders(raw);
|
|
26
26
|
}
|
|
27
|
+
/**
|
|
28
|
+
* Case-insensitive header lookup against the safe-filtered shape produced by
|
|
29
|
+
* {@link extractSafeHeaders} / {@link extractSafeNodeHeaders}.
|
|
30
|
+
*/
|
|
31
|
+
function getHeader(headers, name) {
|
|
32
|
+
if (!headers) return void 0;
|
|
33
|
+
if (headers[name] !== void 0) return headers[name];
|
|
34
|
+
const lowerName = name.toLowerCase();
|
|
35
|
+
if (headers[lowerName] !== void 0) return headers[lowerName];
|
|
36
|
+
for (const [key, value] of Object.entries(headers)) if (key.toLowerCase() === lowerName) return value;
|
|
37
|
+
}
|
|
38
|
+
/** Parse a header-derived numeric string. Returns `undefined` for empty/invalid input. */
|
|
39
|
+
function normalizeNumber(value) {
|
|
40
|
+
if (!value) return void 0;
|
|
41
|
+
const parsed = Number(value);
|
|
42
|
+
return Number.isFinite(parsed) ? parsed : void 0;
|
|
43
|
+
}
|
|
27
44
|
//#endregion
|
|
28
|
-
export { extractSafeNodeHeaders as n, extractSafeHeaders as t };
|
|
45
|
+
export { normalizeNumber as i, extractSafeNodeHeaders as n, getHeader as r, extractSafeHeaders as t };
|
|
29
46
|
|
|
30
|
-
//# sourceMappingURL=headers-
|
|
47
|
+
//# sourceMappingURL=headers-CU-QqnYg.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"headers-CU-QqnYg.mjs","names":[],"sources":["../src/shared/headers.ts"],"sourcesContent":["import { filterSafeHeaders } from '../utils'\n\n/**\n * Extract headers from a Web API `Headers` object and filter out sensitive ones.\n * Works with any runtime that supports the standard `Headers` API (Hono, Elysia,\n * Nitro v3, Cloudflare Workers, Bun, Deno, etc.).\n */\nexport function extractSafeHeaders(headers: Headers): Record<string, string> {\n const raw: Record<string, string> = {}\n headers.forEach((value, key) => {\n raw[key] = value\n })\n return filterSafeHeaders(raw)\n}\n\n/**\n * Extract headers from Node.js `IncomingHttpHeaders` and filter out sensitive ones.\n * Works with Express, Fastify, and any Node.js HTTP server using `req.headers`.\n */\nexport function extractSafeNodeHeaders(headers: Record<string, string | string[] | undefined>): Record<string, string> {\n const raw: Record<string, string> = {}\n for (const [key, value] of Object.entries(headers)) {\n if (value === undefined) continue\n raw[key] = Array.isArray(value) ? value.join(', ') : value\n }\n return filterSafeHeaders(raw)\n}\n\n/**\n * Case-insensitive header lookup against the safe-filtered shape produced by\n * {@link extractSafeHeaders} / {@link extractSafeNodeHeaders}.\n */\nexport function getHeader(headers: Record<string, string> | undefined, name: string): string | undefined {\n if (!headers) return undefined\n if (headers[name] !== undefined) return headers[name]\n const lowerName = name.toLowerCase()\n if (headers[lowerName] !== undefined) return headers[lowerName]\n for (const [key, value] of Object.entries(headers)) {\n if (key.toLowerCase() === lowerName) return value\n }\n return undefined\n}\n\n/** Parse a header-derived numeric string. Returns `undefined` for empty/invalid input. */\nexport function normalizeNumber(value: string | undefined): number | undefined {\n if (!value) return undefined\n const parsed = Number(value)\n return Number.isFinite(parsed) ? parsed : undefined\n}\n"],"mappings":";;;;;;;AAOA,SAAgB,mBAAmB,SAA0C;CAC3E,MAAM,MAA8B,EAAE;AACtC,SAAQ,SAAS,OAAO,QAAQ;AAC9B,MAAI,OAAO;GACX;AACF,QAAO,kBAAkB,IAAI;;;;;;AAO/B,SAAgB,uBAAuB,SAAgF;CACrH,MAAM,MAA8B,EAAE;AACtC,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,QAAQ,EAAE;AAClD,MAAI,UAAU,KAAA,EAAW;AACzB,MAAI,OAAO,MAAM,QAAQ,MAAM,GAAG,MAAM,KAAK,KAAK,GAAG;;AAEvD,QAAO,kBAAkB,IAAI;;;;;;AAO/B,SAAgB,UAAU,SAA6C,MAAkC;AACvG,KAAI,CAAC,QAAS,QAAO,KAAA;AACrB,KAAI,QAAQ,UAAU,KAAA,EAAW,QAAO,QAAQ;CAChD,MAAM,YAAY,KAAK,aAAa;AACpC,KAAI,QAAQ,eAAe,KAAA,EAAW,QAAO,QAAQ;AACrD,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,QAAQ,CAChD,KAAI,IAAI,aAAa,KAAK,UAAW,QAAO;;;AAMhD,SAAgB,gBAAgB,OAA+C;AAC7E,KAAI,CAAC,MAAO,QAAO,KAAA;CACnB,MAAM,SAAS,OAAO,MAAM;AAC5B,QAAO,OAAO,SAAS,OAAO,GAAG,SAAS,KAAA"}
|
package/dist/hono/index.d.mts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Y as RequestLogger } from "../audit-
|
|
2
|
-
import { t as BaseEvlogOptions } from "../middleware-
|
|
1
|
+
import { Y as RequestLogger } from "../audit-CJl-wZ10.mjs";
|
|
2
|
+
import { t as BaseEvlogOptions } from "../middleware-CGM-bOvE.mjs";
|
|
3
3
|
import { MiddlewareHandler } from "hono";
|
|
4
4
|
|
|
5
5
|
//#region src/hono/index.d.ts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/hono/index.ts"],"mappings":";;;;;KAKY,gBAAA,GAAmB,gBAAA;;AAA/B;;;;;AAgBA;;;;;;;;KAAY,cAAA;EAAmB,SAAA;IAAa,GAAA,EAAK,aAAA;EAAA;AAAA;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/hono/index.ts"],"mappings":";;;;;KAKY,gBAAA,GAAmB,gBAAA;;AAA/B;;;;;AAgBA;;;;;;;;KAAY,cAAA;EAAmB,SAAA;IAAa,GAAA,EAAK,aAAA;EAAA;AAAA;;;;;;;;;;;;;;;;;;;iBAiCjC,KAAA,CAAM,OAAA,GAAS,gBAAA,GAAwB,iBAAA"}
|