autotel-adapters 0.3.8 → 0.3.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.
Files changed (87) hide show
  1. package/dist/cloudflare.cjs +60 -124
  2. package/dist/cloudflare.cjs.map +1 -1
  3. package/dist/cloudflare.d.cts +24 -24
  4. package/dist/cloudflare.d.cts.map +1 -0
  5. package/dist/cloudflare.d.ts +24 -24
  6. package/dist/cloudflare.d.ts.map +1 -0
  7. package/dist/cloudflare.js +69 -3
  8. package/dist/cloudflare.js.map +1 -1
  9. package/dist/core.cjs +94 -74
  10. package/dist/core.cjs.map +1 -1
  11. package/dist/core.d.cts +20 -19
  12. package/dist/core.d.cts.map +1 -0
  13. package/dist/core.d.ts +20 -19
  14. package/dist/core.d.ts.map +1 -0
  15. package/dist/core.js +110 -2
  16. package/dist/core.js.map +1 -1
  17. package/dist/express.cjs +67 -127
  18. package/dist/express.cjs.map +1 -1
  19. package/dist/express.d.cts +24 -24
  20. package/dist/express.d.cts.map +1 -0
  21. package/dist/express.d.ts +24 -24
  22. package/dist/express.d.ts.map +1 -0
  23. package/dist/express.js +78 -3
  24. package/dist/express.js.map +1 -1
  25. package/dist/fastify.cjs +58 -118
  26. package/dist/fastify.cjs.map +1 -1
  27. package/dist/fastify.d.cts +24 -24
  28. package/dist/fastify.d.cts.map +1 -0
  29. package/dist/fastify.d.ts +24 -24
  30. package/dist/fastify.d.ts.map +1 -0
  31. package/dist/fastify.js +69 -3
  32. package/dist/fastify.js.map +1 -1
  33. package/dist/hono.cjs +18 -48
  34. package/dist/hono.cjs.map +1 -1
  35. package/dist/hono.d.cts +6 -6
  36. package/dist/hono.d.cts.map +1 -0
  37. package/dist/hono.d.ts +6 -6
  38. package/dist/hono.d.ts.map +1 -0
  39. package/dist/hono.js +22 -3
  40. package/dist/hono.js.map +1 -1
  41. package/dist/index.cjs +27 -455
  42. package/dist/index.d.cts +9 -11
  43. package/dist/index.d.ts +9 -11
  44. package/dist/index.js +10 -10
  45. package/dist/next.cjs +56 -119
  46. package/dist/next.cjs.map +1 -1
  47. package/dist/next.d.cts +21 -21
  48. package/dist/next.d.cts.map +1 -0
  49. package/dist/next.d.ts +21 -21
  50. package/dist/next.d.ts.map +1 -0
  51. package/dist/next.js +65 -3
  52. package/dist/next.js.map +1 -1
  53. package/dist/nitro.cjs +50 -93
  54. package/dist/nitro.cjs.map +1 -1
  55. package/dist/nitro.d.cts +19 -19
  56. package/dist/nitro.d.cts.map +1 -0
  57. package/dist/nitro.d.ts +19 -19
  58. package/dist/nitro.d.ts.map +1 -0
  59. package/dist/nitro.js +62 -3
  60. package/dist/nitro.js.map +1 -1
  61. package/dist/tanstack.cjs +16 -46
  62. package/dist/tanstack.cjs.map +1 -1
  63. package/dist/tanstack.d.cts +9 -9
  64. package/dist/tanstack.d.cts.map +1 -0
  65. package/dist/tanstack.d.ts +9 -9
  66. package/dist/tanstack.d.ts.map +1 -0
  67. package/dist/tanstack.js +20 -3
  68. package/dist/tanstack.js.map +1 -1
  69. package/package.json +5 -5
  70. package/dist/chunk-2YPL66HM.js +0 -79
  71. package/dist/chunk-2YPL66HM.js.map +0 -1
  72. package/dist/chunk-6TOW47TB.js +0 -70
  73. package/dist/chunk-6TOW47TB.js.map +0 -1
  74. package/dist/chunk-DJ2OU3S6.js +0 -90
  75. package/dist/chunk-DJ2OU3S6.js.map +0 -1
  76. package/dist/chunk-FAHH33UI.js +0 -76
  77. package/dist/chunk-FAHH33UI.js.map +0 -1
  78. package/dist/chunk-HTZFHBTN.js +0 -82
  79. package/dist/chunk-HTZFHBTN.js.map +0 -1
  80. package/dist/chunk-JH5ZTTLF.js +0 -23
  81. package/dist/chunk-JH5ZTTLF.js.map +0 -1
  82. package/dist/chunk-U3U4WH42.js +0 -21
  83. package/dist/chunk-U3U4WH42.js.map +0 -1
  84. package/dist/chunk-VJZDW2DS.js +0 -87
  85. package/dist/chunk-VJZDW2DS.js.map +0 -1
  86. package/dist/index.cjs.map +0 -1
  87. package/dist/index.js.map +0 -1
package/dist/express.cjs CHANGED
@@ -1,146 +1,86 @@
1
- 'use strict';
1
+ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
2
+ const require_core = require('./core.cjs');
3
+ let autotel = require("autotel");
4
+ let node_async_hooks = require("node:async_hooks");
2
5
 
3
- var async_hooks = require('async_hooks');
4
- var autotel = require('autotel');
5
-
6
- // src/express.ts
7
- function createUseLogger(options) {
8
- return function useLogger2(context, requestLoggerOptions) {
9
- let logger;
10
- try {
11
- logger = autotel.getRequestLogger(void 0, requestLoggerOptions);
12
- } catch {
13
- throw new Error(
14
- `[autotel-adapters/${options.adapterName}] No active trace context. Wrap your handler with autotel trace instrumentation before calling useLogger().`
15
- );
16
- }
17
- if (context && options.enrich) {
18
- const extra = options.enrich(context);
19
- if (extra && Object.keys(extra).length > 0) {
20
- logger.set(extra);
21
- }
22
- }
23
- return logger;
24
- };
25
- }
26
- function createRequestRunner(storage) {
27
- return function runRequest2(spanName, enrich, handler, options) {
28
- const wrapped = autotel.trace(
29
- { name: spanName },
30
- (ctx) => async () => {
31
- const log = autotel.getRequestLogger(ctx, options?.requestLoggerOptions);
32
- enrich(log);
33
- try {
34
- return await storage.run(log, () => handler());
35
- } catch (error) {
36
- log.error(error instanceof Error ? error : new Error(String(error)));
37
- throw error;
38
- } finally {
39
- if (options?.autoEmit !== false) {
40
- log.emitNow(options?.finalize?.());
41
- }
42
- }
43
- }
44
- );
45
- return wrapped();
46
- };
47
- }
48
- function createAdapterToolkit(options) {
49
- return {
50
- useLogger: createUseLogger(options),
51
- parseError: autotel.parseError,
52
- createStructuredError: autotel.createStructuredError,
53
- createDrainPipeline: autotel.createDrainPipeline
54
- };
55
- }
56
-
57
- // src/express.ts
58
- var expressLoggerStorage = new async_hooks.AsyncLocalStorage();
6
+ //#region src/express.ts
7
+ const expressLoggerStorage = new node_async_hooks.AsyncLocalStorage();
59
8
  function headerValue(headers, name) {
60
- if (!headers) return void 0;
61
- const value = headers[name] ?? headers[name.toLowerCase()];
62
- if (Array.isArray(value)) return value[0];
63
- return typeof value === "string" ? value : void 0;
9
+ if (!headers) return void 0;
10
+ const value = headers[name] ?? headers[name.toLowerCase()];
11
+ if (Array.isArray(value)) return value[0];
12
+ return typeof value === "string" ? value : void 0;
64
13
  }
65
14
  function enrichFromRequest(request) {
66
- if (!request) return void 0;
67
- const url = request.originalUrl ?? request.url;
68
- const route = request.route?.path ?? request.path ?? url;
69
- const requestId = headerValue(request.headers, "x-request-id");
70
- return {
71
- ...request.method ? { "http.request.method": request.method } : {},
72
- ...url ? { "url.full": url } : {},
73
- ...route ? { "http.route": route } : {},
74
- ...requestId ? { "http.request.id": requestId } : {}
75
- };
15
+ if (!request) return void 0;
16
+ const url = request.originalUrl ?? request.url;
17
+ const route = request.route?.path ?? request.path ?? url;
18
+ const requestId = headerValue(request.headers, "x-request-id");
19
+ return {
20
+ ...request.method ? { "http.request.method": request.method } : {},
21
+ ...url ? { "url.full": url } : {},
22
+ ...route ? { "http.route": route } : {},
23
+ ...requestId ? { "http.request.id": requestId } : {}
24
+ };
76
25
  }
77
- var baseUseLogger = createUseLogger({
78
- adapterName: "express",
79
- enrich: enrichFromRequest
26
+ const baseUseLogger = require_core.createUseLogger({
27
+ adapterName: "express",
28
+ enrich: enrichFromRequest
80
29
  });
81
30
  function useLogger(request, requestLoggerOptions) {
82
- const stored = expressLoggerStorage.getStore();
83
- if (stored) return stored;
84
- return baseUseLogger(request, requestLoggerOptions);
31
+ const stored = expressLoggerStorage.getStore();
32
+ if (stored) return stored;
33
+ return baseUseLogger(request, requestLoggerOptions);
85
34
  }
86
- var runRequest = createRequestRunner(expressLoggerStorage);
35
+ const runRequest = require_core.createRequestRunner(expressLoggerStorage);
36
+ /**
37
+ * Wrap an Express route handler. Each request opens a span, gets a
38
+ * request-scoped logger (via `useLogger(req)`), and emits one wide event when
39
+ * the handler settles. Thrown errors are recorded and forwarded to `next`.
40
+ */
87
41
  function withAutotel(handler, options) {
88
- return async (req, res, next) => {
89
- const spanName = typeof options?.spanName === "function" ? options.spanName(req) : options?.spanName ?? `express.${req.method ?? "request"}`;
90
- try {
91
- return await runRequest(
92
- spanName,
93
- (log) => {
94
- const auto = enrichFromRequest(req);
95
- if (auto && Object.keys(auto).length > 0) log.set(auto);
96
- const custom = options?.enrich?.(req);
97
- if (custom && Object.keys(custom).length > 0) log.set(custom);
98
- },
99
- () => handler(req, res, next),
100
- {
101
- requestLoggerOptions: options?.requestLoggerOptions,
102
- autoEmit: options?.autoEmit,
103
- finalize: () => res.statusCode ? { "http.response.status_code": res.statusCode } : void 0
104
- }
105
- );
106
- } catch (error) {
107
- if (typeof next === "function") {
108
- next(error);
109
- return void 0;
110
- }
111
- throw error;
112
- }
113
- };
42
+ return async (req, res, next) => {
43
+ const spanName = typeof options?.spanName === "function" ? options.spanName(req) : options?.spanName ?? `express.${req.method ?? "request"}`;
44
+ try {
45
+ return await runRequest(spanName, (log) => {
46
+ const auto = enrichFromRequest(req);
47
+ if (auto && Object.keys(auto).length > 0) log.set(auto);
48
+ const custom = options?.enrich?.(req);
49
+ if (custom && Object.keys(custom).length > 0) log.set(custom);
50
+ }, () => handler(req, res, next), {
51
+ requestLoggerOptions: options?.requestLoggerOptions,
52
+ autoEmit: options?.autoEmit,
53
+ finalize: () => res.statusCode ? { "http.response.status_code": res.statusCode } : void 0
54
+ });
55
+ } catch (error) {
56
+ if (typeof next === "function") {
57
+ next(error);
58
+ return;
59
+ }
60
+ throw error;
61
+ }
62
+ };
114
63
  }
115
64
  function createExpressAdapter(options) {
116
- return {
117
- withAutotel: (handler) => withAutotel(handler, options),
118
- useLogger,
119
- parseError: (error) => autotel.parseError(error),
120
- createStructuredError: (input) => autotel.createStructuredError(input),
121
- createDrainPipeline: (drainOptions) => autotel.createDrainPipeline(drainOptions)
122
- };
65
+ return {
66
+ withAutotel: (handler) => withAutotel(handler, options),
67
+ useLogger,
68
+ parseError: (error) => (0, autotel.parseError)(error),
69
+ createStructuredError: (input) => (0, autotel.createStructuredError)(input),
70
+ createDrainPipeline: (drainOptions) => (0, autotel.createDrainPipeline)(drainOptions)
71
+ };
123
72
  }
124
- var expressToolkit = createAdapterToolkit({
125
- adapterName: "express",
126
- enrich: enrichFromRequest
73
+ const expressToolkit = require_core.createAdapterToolkit({
74
+ adapterName: "express",
75
+ enrich: enrichFromRequest
127
76
  });
128
77
 
129
- Object.defineProperty(exports, "createDrainPipeline", {
130
- enumerable: true,
131
- get: function () { return autotel.createDrainPipeline; }
132
- });
133
- Object.defineProperty(exports, "createStructuredError", {
134
- enumerable: true,
135
- get: function () { return autotel.createStructuredError; }
136
- });
137
- Object.defineProperty(exports, "parseError", {
138
- enumerable: true,
139
- get: function () { return autotel.parseError; }
140
- });
78
+ //#endregion
79
+ exports.createDrainPipeline = autotel.createDrainPipeline;
141
80
  exports.createExpressAdapter = createExpressAdapter;
81
+ exports.createStructuredError = autotel.createStructuredError;
142
82
  exports.expressToolkit = expressToolkit;
83
+ exports.parseError = autotel.parseError;
143
84
  exports.useLogger = useLogger;
144
85
  exports.withAutotel = withAutotel;
145
- //# sourceMappingURL=express.cjs.map
146
86
  //# sourceMappingURL=express.cjs.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/core.ts","../src/express.ts"],"names":["useLogger","getRequestLogger","runRequest","trace","parseError","createStructuredError","createDrainPipeline","AsyncLocalStorage"],"mappings":";;;;;;AAkCO,SAAS,gBACd,OAAA,EACA;AACA,EAAA,OAAO,SAASA,UAAAA,CACd,OAAA,EACA,oBAAA,EACe;AACf,IAAA,IAAI,MAAA;AACJ,IAAA,IAAI;AACF,MAAA,MAAA,GAASC,wBAAA,CAAiB,QAAW,oBAAoB,CAAA;AAAA,IAC3D,CAAA,CAAA,MAAQ;AACN,MAAA,MAAM,IAAI,KAAA;AAAA,QACR,CAAA,kBAAA,EAAqB,QAAQ,WAAW,CAAA,2GAAA;AAAA,OAE1C;AAAA,IACF;AAEA,IAAA,IAAI,OAAA,IAAW,QAAQ,MAAA,EAAQ;AAC7B,MAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,MAAA,CAAO,OAAO,CAAA;AACpC,MAAA,IAAI,SAAS,MAAA,CAAO,IAAA,CAAK,KAAK,CAAA,CAAE,SAAS,CAAA,EAAG;AAC1C,QAAA,MAAA,CAAO,IAAI,KAAK,CAAA;AAAA,MAClB;AAAA,IACF;AAEA,IAAA,OAAO,MAAA;AAAA,EACT,CAAA;AACF;AAgBO,SAAS,oBAAoB,OAAA,EAA2C;AAC7E,EAAA,OAAO,SAASC,WAAAA,CACd,QAAA,EACA,MAAA,EACA,SACA,OAAA,EACY;AACZ,IAAA,MAAM,OAAA,GAAUC,aAAA;AAAA,MACd,EAAE,MAAM,QAAA,EAAS;AAAA,MACjB,CAAC,QAAQ,YAAwB;AAC/B,QAAA,MAAM,GAAA,GAAMF,wBAAA,CAAiB,GAAA,EAAK,OAAA,EAAS,oBAAoB,CAAA;AAC/D,QAAA,MAAA,CAAO,GAAG,CAAA;AACV,QAAA,IAAI;AACF,UAAA,OAAO,MAAM,OAAA,CAAQ,GAAA,CAAI,GAAA,EAAK,MAAM,SAAS,CAAA;AAAA,QAC/C,SAAS,KAAA,EAAO;AACd,UAAA,GAAA,CAAI,KAAA,CAAM,iBAAiB,KAAA,GAAQ,KAAA,GAAQ,IAAI,KAAA,CAAM,MAAA,CAAO,KAAK,CAAC,CAAC,CAAA;AACnE,UAAA,MAAM,KAAA;AAAA,QACR,CAAA,SAAE;AACA,UAAA,IAAI,OAAA,EAAS,aAAa,KAAA,EAAO;AAC/B,YAAA,GAAA,CAAI,OAAA,CAAQ,OAAA,EAAS,QAAA,IAAY,CAAA;AAAA,UACnC;AAAA,QACF;AAAA,MACF;AAAA,KACF;AACA,IAAA,OAAO,OAAA,EAAQ;AAAA,EACjB,CAAA;AACF;AAEO,SAAS,qBACd,OAAA,EAC0B;AAC1B,EAAA,OAAO;AAAA,IACL,SAAA,EAAW,gBAAgB,OAAO,CAAA;AAAA,gBAClCG,kBAAA;AAAA,2BACAC,6BAAA;AAAA,yBACAC;AAAA,GACF;AACF;;;ACvEA,IAAM,oBAAA,GAAuB,IAAIC,6BAAA,EAAiC;AAElE,SAAS,WAAA,CACP,SACA,IAAA,EACoB;AACpB,EAAA,IAAI,CAAC,SAAS,OAAO,MAAA;AACrB,EAAA,MAAM,QAAQ,OAAA,CAAQ,IAAI,KAAK,OAAA,CAAQ,IAAA,CAAK,aAAa,CAAA;AACzD,EAAA,IAAI,MAAM,OAAA,CAAQ,KAAK,CAAA,EAAG,OAAO,MAAM,CAAC,CAAA;AACxC,EAAA,OAAO,OAAO,KAAA,KAAU,QAAA,GAAW,KAAA,GAAQ,MAAA;AAC7C;AAEA,SAAS,kBACP,OAAA,EACqC;AACrC,EAAA,IAAI,CAAC,SAAS,OAAO,MAAA;AAErB,EAAA,MAAM,GAAA,GAAM,OAAA,CAAQ,WAAA,IAAe,OAAA,CAAQ,GAAA;AAC3C,EAAA,MAAM,KAAA,GAAQ,OAAA,CAAQ,KAAA,EAAO,IAAA,IAAQ,QAAQ,IAAA,IAAQ,GAAA;AACrD,EAAA,MAAM,SAAA,GAAY,WAAA,CAAY,OAAA,CAAQ,OAAA,EAAS,cAAc,CAAA;AAE7D,EAAA,OAAO;AAAA,IACL,GAAI,QAAQ,MAAA,GAAS,EAAE,uBAAuB,OAAA,CAAQ,MAAA,KAAW,EAAC;AAAA,IAClE,GAAI,GAAA,GAAM,EAAE,UAAA,EAAY,GAAA,KAAQ,EAAC;AAAA,IACjC,GAAI,KAAA,GAAQ,EAAE,YAAA,EAAc,KAAA,KAAU,EAAC;AAAA,IACvC,GAAI,SAAA,GAAY,EAAE,iBAAA,EAAmB,SAAA,KAAc;AAAC,GACtD;AACF;AAEA,IAAM,gBAAgB,eAAA,CAAoC;AAAA,EACxD,WAAA,EAAa,SAAA;AAAA,EACb,MAAA,EAAQ;AACV,CAAC,CAAA;AAEM,SAAS,SAAA,CACd,SACA,oBAAA,EACe;AACf,EAAA,MAAM,MAAA,GAAS,qBAAqB,QAAA,EAAS;AAC7C,EAAA,IAAI,QAAQ,OAAO,MAAA;AACnB,EAAA,OAAO,aAAA,CAAc,SAAS,oBAAoB,CAAA;AACpD;AAEA,IAAM,UAAA,GAAa,oBAAoB,oBAAoB,CAAA;AAOpD,SAAS,WAAA,CAKd,SACA,OAAA,EAC4E;AAC5E,EAAA,OAAO,OACL,GAAA,EACA,GAAA,EACA,IAAA,KACiC;AACjC,IAAA,MAAM,QAAA,GACJ,OAAO,OAAA,EAAS,QAAA,KAAa,aACzB,OAAA,CAAQ,QAAA,CAAS,GAAG,CAAA,GACnB,OAAA,EAAS,QAAA,IAAY,CAAA,QAAA,EAAW,GAAA,CAAI,UAAU,SAAS,CAAA,CAAA;AAE9D,IAAA,IAAI;AACF,MAAA,OAAO,MAAM,UAAA;AAAA,QACX,QAAA;AAAA,QACA,CAAC,GAAA,KAAQ;AACP,UAAA,MAAM,IAAA,GAAO,kBAAkB,GAAG,CAAA;AAClC,UAAA,IAAI,IAAA,IAAQ,OAAO,IAAA,CAAK,IAAI,EAAE,MAAA,GAAS,CAAA,EAAG,GAAA,CAAI,GAAA,CAAI,IAAI,CAAA;AACtD,UAAA,MAAM,MAAA,GAAS,OAAA,EAAS,MAAA,GAAS,GAAG,CAAA;AACpC,UAAA,IAAI,MAAA,IAAU,OAAO,IAAA,CAAK,MAAM,EAAE,MAAA,GAAS,CAAA,EAAG,GAAA,CAAI,GAAA,CAAI,MAAM,CAAA;AAAA,QAC9D,CAAA;AAAA,QACA,MAAM,OAAA,CAAQ,GAAA,EAAK,GAAA,EAAK,IAAI,CAAA;AAAA,QAC5B;AAAA,UACE,sBAAsB,OAAA,EAAS,oBAAA;AAAA,UAC/B,UAAU,OAAA,EAAS,QAAA;AAAA,UACnB,QAAA,EAAU,MACR,GAAA,CAAI,UAAA,GACA,EAAE,2BAAA,EAA6B,GAAA,CAAI,YAAW,GAC9C,KAAA;AAAA;AACR,OACF;AAAA,IACF,SAAS,KAAA,EAAO;AACd,MAAA,IAAI,OAAO,SAAS,UAAA,EAAY;AAC9B,QAAA,IAAA,CAAK,KAAK,CAAA;AACV,QAAA,OAAO,MAAA;AAAA,MACT;AACA,MAAA,MAAM,KAAA;AAAA,IACR;AAAA,EACF,CAAA;AACF;AAEO,SAAS,qBAAqB,OAAA,EAAqC;AACxE,EAAA,OAAO;AAAA,IACL,WAAA,EAAa,CAKX,OAAA,KAKG,WAAA,CAAY,SAAS,OAAO,CAAA;AAAA,IACjC,SAAA;AAAA,IACA,UAAA,EAAY,CAAC,KAAA,KAAgCH,kBAAAA,CAAW,KAAK,CAAA;AAAA,IAC7D,qBAAA,EAAuB,CAAC,KAAA,KACtBC,6BAAAA,CAAsB,KAAK,CAAA;AAAA,IAC7B,mBAAA,EAAqB,CACnB,YAAA,KAEAC,2BAAAA,CAAoB,YAAY;AAAA,GACpC;AACF;AAEO,IAAM,iBAAiB,oBAAA,CAAyC;AAAA,EACrE,WAAA,EAAa,SAAA;AAAA,EACb,MAAA,EAAQ;AACV,CAAC","file":"express.cjs","sourcesContent":["import type { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n createDrainPipeline,\n createStructuredError,\n getRequestLogger,\n parseError,\n trace,\n type ParsedError,\n type RequestLogger,\n type RequestLoggerOptions,\n type RequestLogSnapshot,\n type DrainPipelineOptions,\n type PipelineDrainFn,\n type StructuredError,\n type StructuredErrorInput,\n} from 'autotel';\n\nexport interface AdapterUseLoggerOptions<TContext> {\n adapterName: string;\n enrich?: (context: TContext) => Record<string, unknown> | undefined;\n}\n\nexport interface AdapterToolkit<TContext> {\n useLogger: (\n context?: TContext,\n options?: RequestLoggerOptions,\n ) => RequestLogger;\n parseError: (error: unknown) => ParsedError;\n createStructuredError: (input: StructuredErrorInput) => StructuredError;\n createDrainPipeline: <T = unknown>(\n options?: DrainPipelineOptions<T>,\n ) => (drain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>;\n}\n\nexport function createUseLogger<TContext = unknown>(\n options: AdapterUseLoggerOptions<TContext>,\n) {\n return function useLogger(\n context?: TContext,\n requestLoggerOptions?: RequestLoggerOptions,\n ): RequestLogger {\n let logger: RequestLogger;\n try {\n logger = getRequestLogger(undefined, requestLoggerOptions);\n } catch {\n throw new Error(\n `[autotel-adapters/${options.adapterName}] No active trace context. ` +\n `Wrap your handler with autotel trace instrumentation before calling useLogger().`,\n );\n }\n\n if (context && options.enrich) {\n const extra = options.enrich(context);\n if (extra && Object.keys(extra).length > 0) {\n logger.set(extra);\n }\n }\n\n return logger;\n };\n}\n\nexport interface RequestRunnerOptions {\n requestLoggerOptions?: RequestLoggerOptions;\n /** Emit one wide event automatically when the handler settles. Default `true`. */\n autoEmit?: boolean;\n /** Fields merged into the wide event at emit time (e.g. response status). */\n finalize?: () => Record<string, unknown> | undefined;\n}\n\n/**\n * Build a request runner bound to one framework's logger storage. The returned\n * function opens a span, creates a request logger, runs `handler` inside the\n * storage so `useLogger()` resolves it, records thrown errors, and emits one\n * wide event when the handler settles (unless `autoEmit` is `false`).\n */\nexport function createRequestRunner(storage: AsyncLocalStorage<RequestLogger>) {\n return function runRequest<T>(\n spanName: string,\n enrich: (log: RequestLogger) => void,\n handler: () => T | Promise<T>,\n options?: RequestRunnerOptions,\n ): Promise<T> {\n const wrapped = trace(\n { name: spanName },\n (ctx) => async (): Promise<T> => {\n const log = getRequestLogger(ctx, options?.requestLoggerOptions);\n enrich(log);\n try {\n return await storage.run(log, () => handler());\n } catch (error) {\n log.error(error instanceof Error ? error : new Error(String(error)));\n throw error;\n } finally {\n if (options?.autoEmit !== false) {\n log.emitNow(options?.finalize?.());\n }\n }\n },\n );\n return wrapped();\n };\n}\n\nexport function createAdapterToolkit<TContext = unknown>(\n options: AdapterUseLoggerOptions<TContext>,\n): AdapterToolkit<TContext> {\n return {\n useLogger: createUseLogger(options),\n parseError,\n createStructuredError,\n createDrainPipeline,\n };\n}\n\n/**\n * Description of a single adapter config field. `env` is the ordered list of\n * environment variables to fall back to.\n */\nexport interface ConfigField<T> {\n key: keyof T & string;\n env?: string[];\n}\n\nfunction resolveEnv(envKeys?: string[]): string | undefined {\n if (!envKeys) return undefined;\n for (const key of envKeys) {\n const value = process.env[key];\n if (value) return value;\n }\n return undefined;\n}\n\n/**\n * Returns true when at least one env-backed field is not provided via\n * `overrides`, meaning runtime config may still contribute and should be\n * probed to preserve precedence (`overrides > runtime > env`).\n *\n * @example\n * ```ts\n * const FIELDS: ConfigField<MyAdapterConfig>[] = [\n * { key: 'token', env: ['MY_ADAPTER_TOKEN'] },\n * { key: 'endpoint', env: ['MY_ADAPTER_URL'] },\n * ]\n *\n * if (shouldProbeRuntime(FIELDS, overrides)) {\n * runtimeConfig = await loadRuntimeConfig()\n * }\n * ```\n */\nexport function shouldProbeRuntime<T>(\n fields: ConfigField<T>[],\n overrides?: Partial<T>,\n): boolean {\n return fields.some(({ key, env }) => {\n if (!env || env.length === 0) return false;\n if (overrides?.[key] !== undefined) return false;\n return true;\n });\n}\n\n/**\n * Resolve adapter configuration with the standard priority chain:\n *\n * 1. `overrides` passed to the adapter factory\n * 2. `runtimeConfig.autotel.{namespace}.{key}` (if a probe was performed)\n * 3. `runtimeConfig.{namespace}.{key}` (if a probe was performed)\n * 4. `process.env[envKey]` for each env in `field.env`\n *\n * Pass an async `probe` to defer the runtime config lookup so it is only\n * invoked when runtime resolution is needed (i.e. at least one env-backed\n * field is not set by overrides). Adapters that have no probe target may pass\n * `() => Promise.resolve(undefined)`.\n */\nexport async function resolveAdapterConfig<T>(\n namespace: string,\n fields: ConfigField<T>[],\n overrides: Partial<T> | undefined,\n probe: () => Promise<Record<string, any> | undefined>,\n): Promise<Partial<T>> {\n const runtimeConfig = shouldProbeRuntime(fields, overrides)\n ? await probe()\n : undefined;\n const autotelNs = runtimeConfig?.autotel?.[namespace];\n const rootNs = runtimeConfig?.[namespace];\n\n const config: Record<string, unknown> = {};\n for (const { key, env } of fields) {\n config[key] =\n overrides?.[key] ??\n autotelNs?.[key] ??\n rootNs?.[key] ??\n resolveEnv(env);\n }\n\n return config as Partial<T>;\n}\n\nexport type HeadersLike =\n | { get(name: string): string | null }\n | Record<string, string | undefined>;\n\nexport function getHeader(\n headers: HeadersLike | undefined,\n name: string,\n): string | undefined {\n if (!headers) return undefined;\n if ('get' in headers && typeof headers.get === 'function') {\n return headers.get(name) ?? undefined;\n }\n const dictionary = headers as Record<string, string | undefined>;\n const value = dictionary[name] ?? dictionary[name.toLowerCase()];\n return typeof value === 'string' ? value : undefined;\n}\n\nexport type {\n RequestLogger,\n RequestLoggerOptions,\n RequestLogSnapshot,\n ParsedError,\n StructuredError,\n StructuredErrorInput,\n DrainPipelineOptions,\n PipelineDrainFn,\n};\n","import { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n createDrainPipeline,\n createStructuredError,\n parseError,\n type DrainPipelineOptions,\n type ParsedError,\n type PipelineDrainFn,\n type RequestLogger,\n type RequestLoggerOptions,\n type StructuredError,\n type StructuredErrorInput,\n} from 'autotel';\nimport {\n createAdapterToolkit,\n createRequestRunner,\n createUseLogger,\n} from './core';\n\nexport interface ExpressRequestLike {\n method?: string;\n originalUrl?: string;\n url?: string;\n path?: string;\n route?: { path?: string };\n headers?: Record<string, string | string[] | undefined>;\n}\n\nexport interface ExpressResponseLike {\n statusCode?: number;\n}\n\nexport type ExpressNext = (err?: unknown) => void;\n\nexport interface ExpressWithAutotelOptions {\n spanName?: string | ((request: ExpressRequestLike) => string);\n requestLoggerOptions?: RequestLoggerOptions;\n enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;\n /** Emit one wide event automatically when the handler settles. Default `true`. */\n autoEmit?: boolean;\n}\n\nconst expressLoggerStorage = new AsyncLocalStorage<RequestLogger>();\n\nfunction headerValue(\n headers: ExpressRequestLike['headers'],\n name: string,\n): string | undefined {\n if (!headers) return undefined;\n const value = headers[name] ?? headers[name.toLowerCase()];\n if (Array.isArray(value)) return value[0];\n return typeof value === 'string' ? value : undefined;\n}\n\nfunction enrichFromRequest(\n request?: ExpressRequestLike,\n): Record<string, unknown> | undefined {\n if (!request) return undefined;\n\n const url = request.originalUrl ?? request.url;\n const route = request.route?.path ?? request.path ?? url;\n const requestId = headerValue(request.headers, 'x-request-id');\n\n return {\n ...(request.method ? { 'http.request.method': request.method } : {}),\n ...(url ? { 'url.full': url } : {}),\n ...(route ? { 'http.route': route } : {}),\n ...(requestId ? { 'http.request.id': requestId } : {}),\n };\n}\n\nconst baseUseLogger = createUseLogger<ExpressRequestLike>({\n adapterName: 'express',\n enrich: enrichFromRequest,\n});\n\nexport function useLogger(\n request?: ExpressRequestLike,\n requestLoggerOptions?: RequestLoggerOptions,\n): RequestLogger {\n const stored = expressLoggerStorage.getStore();\n if (stored) return stored;\n return baseUseLogger(request, requestLoggerOptions);\n}\n\nconst runRequest = createRequestRunner(expressLoggerStorage);\n\n/**\n * Wrap an Express route handler. Each request opens a span, gets a\n * request-scoped logger (via `useLogger(req)`), and emits one wide event when\n * the handler settles. Thrown errors are recorded and forwarded to `next`.\n */\nexport function withAutotel<\n TReq extends ExpressRequestLike,\n TRes extends ExpressResponseLike,\n TReturn,\n>(\n handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>,\n options?: ExpressWithAutotelOptions,\n): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined> {\n return async (\n req: TReq,\n res: TRes,\n next?: ExpressNext,\n ): Promise<TReturn | undefined> => {\n const spanName =\n typeof options?.spanName === 'function'\n ? options.spanName(req)\n : (options?.spanName ?? `express.${req.method ?? 'request'}`);\n\n try {\n return await runRequest<TReturn>(\n spanName,\n (log) => {\n const auto = enrichFromRequest(req);\n if (auto && Object.keys(auto).length > 0) log.set(auto);\n const custom = options?.enrich?.(req);\n if (custom && Object.keys(custom).length > 0) log.set(custom);\n },\n () => handler(req, res, next),\n {\n requestLoggerOptions: options?.requestLoggerOptions,\n autoEmit: options?.autoEmit,\n finalize: () =>\n res.statusCode\n ? { 'http.response.status_code': res.statusCode }\n : undefined,\n },\n );\n } catch (error) {\n if (typeof next === 'function') {\n next(error);\n return undefined;\n }\n throw error;\n }\n };\n}\n\nexport function createExpressAdapter(options?: ExpressWithAutotelOptions) {\n return {\n withAutotel: <\n TReq extends ExpressRequestLike,\n TRes extends ExpressResponseLike,\n TReturn,\n >(\n handler: (\n req: TReq,\n res: TRes,\n next?: ExpressNext,\n ) => TReturn | Promise<TReturn>,\n ) => withAutotel(handler, options),\n useLogger,\n parseError: (error: unknown): ParsedError => parseError(error),\n createStructuredError: (input: StructuredErrorInput): StructuredError =>\n createStructuredError(input),\n createDrainPipeline: <T = unknown>(\n drainOptions?: DrainPipelineOptions<T>,\n ): ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>) =>\n createDrainPipeline(drainOptions),\n };\n}\n\nexport const expressToolkit = createAdapterToolkit<ExpressRequestLike>({\n adapterName: 'express',\n enrich: enrichFromRequest,\n});\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"]}
1
+ {"version":3,"file":"express.cjs","names":["AsyncLocalStorage","createUseLogger","createRequestRunner","createAdapterToolkit"],"sources":["../src/express.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n createDrainPipeline,\n createStructuredError,\n parseError,\n type DrainPipelineOptions,\n type ParsedError,\n type PipelineDrainFn,\n type RequestLogger,\n type RequestLoggerOptions,\n type StructuredError,\n type StructuredErrorInput,\n} from 'autotel';\nimport {\n createAdapterToolkit,\n createRequestRunner,\n createUseLogger,\n} from './core';\n\nexport interface ExpressRequestLike {\n method?: string;\n originalUrl?: string;\n url?: string;\n path?: string;\n route?: { path?: string };\n headers?: Record<string, string | string[] | undefined>;\n}\n\nexport interface ExpressResponseLike {\n statusCode?: number;\n}\n\nexport type ExpressNext = (err?: unknown) => void;\n\nexport interface ExpressWithAutotelOptions {\n spanName?: string | ((request: ExpressRequestLike) => string);\n requestLoggerOptions?: RequestLoggerOptions;\n enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;\n /** Emit one wide event automatically when the handler settles. Default `true`. */\n autoEmit?: boolean;\n}\n\nconst expressLoggerStorage = new AsyncLocalStorage<RequestLogger>();\n\nfunction headerValue(\n headers: ExpressRequestLike['headers'],\n name: string,\n): string | undefined {\n if (!headers) return undefined;\n const value = headers[name] ?? headers[name.toLowerCase()];\n if (Array.isArray(value)) return value[0];\n return typeof value === 'string' ? value : undefined;\n}\n\nfunction enrichFromRequest(\n request?: ExpressRequestLike,\n): Record<string, unknown> | undefined {\n if (!request) return undefined;\n\n const url = request.originalUrl ?? request.url;\n const route = request.route?.path ?? request.path ?? url;\n const requestId = headerValue(request.headers, 'x-request-id');\n\n return {\n ...(request.method ? { 'http.request.method': request.method } : {}),\n ...(url ? { 'url.full': url } : {}),\n ...(route ? { 'http.route': route } : {}),\n ...(requestId ? { 'http.request.id': requestId } : {}),\n };\n}\n\nconst baseUseLogger = createUseLogger<ExpressRequestLike>({\n adapterName: 'express',\n enrich: enrichFromRequest,\n});\n\nexport function useLogger(\n request?: ExpressRequestLike,\n requestLoggerOptions?: RequestLoggerOptions,\n): RequestLogger {\n const stored = expressLoggerStorage.getStore();\n if (stored) return stored;\n return baseUseLogger(request, requestLoggerOptions);\n}\n\nconst runRequest = createRequestRunner(expressLoggerStorage);\n\n/**\n * Wrap an Express route handler. Each request opens a span, gets a\n * request-scoped logger (via `useLogger(req)`), and emits one wide event when\n * the handler settles. Thrown errors are recorded and forwarded to `next`.\n */\nexport function withAutotel<\n TReq extends ExpressRequestLike,\n TRes extends ExpressResponseLike,\n TReturn,\n>(\n handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>,\n options?: ExpressWithAutotelOptions,\n): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined> {\n return async (\n req: TReq,\n res: TRes,\n next?: ExpressNext,\n ): Promise<TReturn | undefined> => {\n const spanName =\n typeof options?.spanName === 'function'\n ? options.spanName(req)\n : (options?.spanName ?? `express.${req.method ?? 'request'}`);\n\n try {\n return await runRequest<TReturn>(\n spanName,\n (log) => {\n const auto = enrichFromRequest(req);\n if (auto && Object.keys(auto).length > 0) log.set(auto);\n const custom = options?.enrich?.(req);\n if (custom && Object.keys(custom).length > 0) log.set(custom);\n },\n () => handler(req, res, next),\n {\n requestLoggerOptions: options?.requestLoggerOptions,\n autoEmit: options?.autoEmit,\n finalize: () =>\n res.statusCode\n ? { 'http.response.status_code': res.statusCode }\n : undefined,\n },\n );\n } catch (error) {\n if (typeof next === 'function') {\n next(error);\n return undefined;\n }\n throw error;\n }\n };\n}\n\nexport function createExpressAdapter(options?: ExpressWithAutotelOptions) {\n return {\n withAutotel: <\n TReq extends ExpressRequestLike,\n TRes extends ExpressResponseLike,\n TReturn,\n >(\n handler: (\n req: TReq,\n res: TRes,\n next?: ExpressNext,\n ) => TReturn | Promise<TReturn>,\n ) => withAutotel(handler, options),\n useLogger,\n parseError: (error: unknown): ParsedError => parseError(error),\n createStructuredError: (input: StructuredErrorInput): StructuredError =>\n createStructuredError(input),\n createDrainPipeline: <T = unknown>(\n drainOptions?: DrainPipelineOptions<T>,\n ): ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>) =>\n createDrainPipeline(drainOptions),\n };\n}\n\nexport const expressToolkit = createAdapterToolkit<ExpressRequestLike>({\n adapterName: 'express',\n enrich: enrichFromRequest,\n});\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;;AA0CA,MAAM,uBAAuB,IAAIA,mCAAiC;AAElE,SAAS,YACP,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,MAAM,QAAQ,QAAQ,SAAS,QAAQ,KAAK,YAAY;CACxD,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM;CACvC,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C;AAEA,SAAS,kBACP,SACqC;CACrC,IAAI,CAAC,SAAS,OAAO;CAErB,MAAM,MAAM,QAAQ,eAAe,QAAQ;CAC3C,MAAM,QAAQ,QAAQ,OAAO,QAAQ,QAAQ,QAAQ;CACrD,MAAM,YAAY,YAAY,QAAQ,SAAS,cAAc;CAE7D,OAAO;EACL,GAAI,QAAQ,SAAS,EAAE,uBAAuB,QAAQ,OAAO,IAAI,CAAC;EAClE,GAAI,MAAM,EAAE,YAAY,IAAI,IAAI,CAAC;EACjC,GAAI,QAAQ,EAAE,cAAc,MAAM,IAAI,CAAC;EACvC,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,gBAAgBC,6BAAoC;CACxD,aAAa;CACb,QAAQ;AACV,CAAC;AAED,SAAgB,UACd,SACA,sBACe;CACf,MAAM,SAAS,qBAAqB,SAAS;CAC7C,IAAI,QAAQ,OAAO;CACnB,OAAO,cAAc,SAAS,oBAAoB;AACpD;AAEA,MAAM,aAAaC,iCAAoB,oBAAoB;;;;;;AAO3D,SAAgB,YAKd,SACA,SAC4E;CAC5E,OAAO,OACL,KACA,KACA,SACiC;EACjC,MAAM,WACJ,OAAO,SAAS,aAAa,aACzB,QAAQ,SAAS,GAAG,IACnB,SAAS,YAAY,WAAW,IAAI,UAAU;EAErD,IAAI;GACF,OAAO,MAAM,WACX,WACC,QAAQ;IACP,MAAM,OAAO,kBAAkB,GAAG;IAClC,IAAI,QAAQ,OAAO,KAAK,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,IAAI;IACtD,MAAM,SAAS,SAAS,SAAS,GAAG;IACpC,IAAI,UAAU,OAAO,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,MAAM;GAC9D,SACM,QAAQ,KAAK,KAAK,IAAI,GAC5B;IACE,sBAAsB,SAAS;IAC/B,UAAU,SAAS;IACnB,gBACE,IAAI,aACA,EAAE,6BAA6B,IAAI,WAAW,IAC9C;GACR,CACF;EACF,SAAS,OAAO;GACd,IAAI,OAAO,SAAS,YAAY;IAC9B,KAAK,KAAK;IACV;GACF;GACA,MAAM;EACR;CACF;AACF;AAEA,SAAgB,qBAAqB,SAAqC;CACxE,OAAO;EACL,cAKE,YAKG,YAAY,SAAS,OAAO;EACjC;EACA,aAAa,kCAA2C,KAAK;EAC7D,wBAAwB,6CACA,KAAK;EAC7B,sBACE,kDAEoB,YAAY;CACpC;AACF;AAEA,MAAa,iBAAiBC,kCAAyC;CACrE,aAAa;CACb,QAAQ;AACV,CAAC"}
@@ -1,28 +1,27 @@
1
- import { AdapterToolkit } from './core.cjs';
2
- import { RequestLoggerOptions, RequestLogger, ParsedError, StructuredErrorInput, StructuredError, DrainPipelineOptions, PipelineDrainFn } from 'autotel';
3
- export { createDrainPipeline, createStructuredError, parseError } from 'autotel';
4
- import 'node:async_hooks';
1
+ import { AdapterToolkit } from "./core.cjs";
2
+ import { DrainPipelineOptions, ParsedError, PipelineDrainFn, RequestLogger, RequestLoggerOptions, StructuredError, StructuredErrorInput, createDrainPipeline, createStructuredError, parseError } from "autotel";
5
3
 
4
+ //#region src/express.d.ts
6
5
  interface ExpressRequestLike {
7
- method?: string;
8
- originalUrl?: string;
9
- url?: string;
6
+ method?: string;
7
+ originalUrl?: string;
8
+ url?: string;
9
+ path?: string;
10
+ route?: {
10
11
  path?: string;
11
- route?: {
12
- path?: string;
13
- };
14
- headers?: Record<string, string | string[] | undefined>;
12
+ };
13
+ headers?: Record<string, string | string[] | undefined>;
15
14
  }
16
15
  interface ExpressResponseLike {
17
- statusCode?: number;
16
+ statusCode?: number;
18
17
  }
19
18
  type ExpressNext = (err?: unknown) => void;
20
19
  interface ExpressWithAutotelOptions {
21
- spanName?: string | ((request: ExpressRequestLike) => string);
22
- requestLoggerOptions?: RequestLoggerOptions;
23
- enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;
24
- /** Emit one wide event automatically when the handler settles. Default `true`. */
25
- autoEmit?: boolean;
20
+ spanName?: string | ((request: ExpressRequestLike) => string);
21
+ requestLoggerOptions?: RequestLoggerOptions;
22
+ enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;
23
+ /** Emit one wide event automatically when the handler settles. Default `true`. */
24
+ autoEmit?: boolean;
26
25
  }
27
26
  declare function useLogger(request?: ExpressRequestLike, requestLoggerOptions?: RequestLoggerOptions): RequestLogger;
28
27
  /**
@@ -32,12 +31,13 @@ declare function useLogger(request?: ExpressRequestLike, requestLoggerOptions?:
32
31
  */
33
32
  declare function withAutotel<TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>, options?: ExpressWithAutotelOptions): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
34
33
  declare function createExpressAdapter(options?: ExpressWithAutotelOptions): {
35
- withAutotel: <TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>) => (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
36
- useLogger: typeof useLogger;
37
- parseError: (error: unknown) => ParsedError;
38
- createStructuredError: (input: StructuredErrorInput) => StructuredError;
39
- createDrainPipeline: <T = unknown>(drainOptions?: DrainPipelineOptions<T>) => ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>);
34
+ withAutotel: <TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>) => (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
35
+ useLogger: typeof useLogger;
36
+ parseError: (error: unknown) => ParsedError;
37
+ createStructuredError: (input: StructuredErrorInput) => StructuredError;
38
+ createDrainPipeline: <T = unknown>(drainOptions?: DrainPipelineOptions<T>) => ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>);
40
39
  };
41
40
  declare const expressToolkit: AdapterToolkit<ExpressRequestLike>;
42
-
43
- export { type ExpressNext, type ExpressRequestLike, type ExpressResponseLike, type ExpressWithAutotelOptions, createExpressAdapter, expressToolkit, useLogger, withAutotel };
41
+ //#endregion
42
+ export { ExpressNext, ExpressRequestLike, ExpressResponseLike, ExpressWithAutotelOptions, createDrainPipeline, createExpressAdapter, createStructuredError, expressToolkit, parseError, useLogger, withAutotel };
43
+ //# sourceMappingURL=express.d.cts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"express.d.cts","names":[],"sources":["../src/express.ts"],"mappings":";;;;UAmBiB,kBAAA;EACf,MAAA;EACA,WAAA;EACA,GAAA;EACA,IAAA;EACA,KAAA;IAAU,IAAA;EAAA;EACV,OAAA,GAAU,MAAM;AAAA;AAAA,UAGD,mBAAA;EACf,UAAU;AAAA;AAAA,KAGA,WAAA,IAAe,GAAa;AAAA,UAEvB,yBAAA;EACf,QAAA,cAAsB,OAAA,EAAS,kBAAA;EAC/B,oBAAA,GAAuB,oBAAA;EACvB,MAAA,IAAU,OAAA,EAAS,kBAAA,KAAuB,MAAA;EATR;EAWlC,QAAA;AAAA;AAAA,iBAqCc,SAAA,CACd,OAAA,GAAU,kBAAA,EACV,oBAAA,GAAuB,oBAAA,GACtB,aAAA;AA/CH;;;;AAAwC;AAAxC,iBA4DgB,WAAA,cACD,kBAAA,eACA,mBAAA,WAGb,OAAA,GAAU,GAAA,EAAK,IAAA,EAAM,GAAA,EAAK,IAAA,EAAM,IAAA,GAAO,WAAA,KAAgB,OAAA,GAAU,OAAA,CAAQ,OAAA,GACzE,OAAA,GAAU,yBAAA,IACR,GAAA,EAAK,IAAA,EAAM,GAAA,EAAK,IAAA,EAAM,IAAA,GAAO,WAAA,KAAgB,OAAA,CAAQ,OAAA;AAAA,iBAwCzC,oBAAA,CAAqB,OAAA,GAAU,yBAAA;6BAG5B,kBAAA,eACA,mBAAA,WACN,OAAA,GAGL,GAAA,EAAK,IAAA,EACL,GAAA,EAAK,IAAA,EACL,IAAA,GAAO,WAAA,KACJ,OAAA,GAAU,OAAA,CAAQ,OAAA,OAAQ,GAAA,EAAA,IAAA,EAAA,GAAA,EAAA,IAAA,EAAA,IAAA,GAnDJ,WAAA,KAAW,OAAA,CAAA,OAAA;;kCAsDV,WAAA;iCACC,oBAAA,KAAuB,eAAA;qCAE/B,YAAA,GACN,oBAAA,CAAqB,CAAA,QACjC,UAAA,GAAa,KAAA,EAAO,CAAA,cAAe,OAAA,WAAkB,eAAA,CAAgB,CAAA;AAAA;AAAA,cAKjE,cAAA,EAAc,cAAA,CAAA,kBAAA"}
package/dist/express.d.ts CHANGED
@@ -1,28 +1,27 @@
1
- import { AdapterToolkit } from './core.js';
2
- import { RequestLoggerOptions, RequestLogger, ParsedError, StructuredErrorInput, StructuredError, DrainPipelineOptions, PipelineDrainFn } from 'autotel';
3
- export { createDrainPipeline, createStructuredError, parseError } from 'autotel';
4
- import 'node:async_hooks';
1
+ import { AdapterToolkit } from "./core.js";
2
+ import { DrainPipelineOptions, ParsedError, PipelineDrainFn, RequestLogger, RequestLoggerOptions, StructuredError, StructuredErrorInput, createDrainPipeline, createStructuredError, parseError } from "autotel";
5
3
 
4
+ //#region src/express.d.ts
6
5
  interface ExpressRequestLike {
7
- method?: string;
8
- originalUrl?: string;
9
- url?: string;
6
+ method?: string;
7
+ originalUrl?: string;
8
+ url?: string;
9
+ path?: string;
10
+ route?: {
10
11
  path?: string;
11
- route?: {
12
- path?: string;
13
- };
14
- headers?: Record<string, string | string[] | undefined>;
12
+ };
13
+ headers?: Record<string, string | string[] | undefined>;
15
14
  }
16
15
  interface ExpressResponseLike {
17
- statusCode?: number;
16
+ statusCode?: number;
18
17
  }
19
18
  type ExpressNext = (err?: unknown) => void;
20
19
  interface ExpressWithAutotelOptions {
21
- spanName?: string | ((request: ExpressRequestLike) => string);
22
- requestLoggerOptions?: RequestLoggerOptions;
23
- enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;
24
- /** Emit one wide event automatically when the handler settles. Default `true`. */
25
- autoEmit?: boolean;
20
+ spanName?: string | ((request: ExpressRequestLike) => string);
21
+ requestLoggerOptions?: RequestLoggerOptions;
22
+ enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;
23
+ /** Emit one wide event automatically when the handler settles. Default `true`. */
24
+ autoEmit?: boolean;
26
25
  }
27
26
  declare function useLogger(request?: ExpressRequestLike, requestLoggerOptions?: RequestLoggerOptions): RequestLogger;
28
27
  /**
@@ -32,12 +31,13 @@ declare function useLogger(request?: ExpressRequestLike, requestLoggerOptions?:
32
31
  */
33
32
  declare function withAutotel<TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>, options?: ExpressWithAutotelOptions): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
34
33
  declare function createExpressAdapter(options?: ExpressWithAutotelOptions): {
35
- withAutotel: <TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>) => (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
36
- useLogger: typeof useLogger;
37
- parseError: (error: unknown) => ParsedError;
38
- createStructuredError: (input: StructuredErrorInput) => StructuredError;
39
- createDrainPipeline: <T = unknown>(drainOptions?: DrainPipelineOptions<T>) => ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>);
34
+ withAutotel: <TReq extends ExpressRequestLike, TRes extends ExpressResponseLike, TReturn>(handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>) => (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined>;
35
+ useLogger: typeof useLogger;
36
+ parseError: (error: unknown) => ParsedError;
37
+ createStructuredError: (input: StructuredErrorInput) => StructuredError;
38
+ createDrainPipeline: <T = unknown>(drainOptions?: DrainPipelineOptions<T>) => ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>);
40
39
  };
41
40
  declare const expressToolkit: AdapterToolkit<ExpressRequestLike>;
42
-
43
- export { type ExpressNext, type ExpressRequestLike, type ExpressResponseLike, type ExpressWithAutotelOptions, createExpressAdapter, expressToolkit, useLogger, withAutotel };
41
+ //#endregion
42
+ export { ExpressNext, ExpressRequestLike, ExpressResponseLike, ExpressWithAutotelOptions, createDrainPipeline, createExpressAdapter, createStructuredError, expressToolkit, parseError, useLogger, withAutotel };
43
+ //# sourceMappingURL=express.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"express.d.ts","names":[],"sources":["../src/express.ts"],"mappings":";;;;UAmBiB,kBAAA;EACf,MAAA;EACA,WAAA;EACA,GAAA;EACA,IAAA;EACA,KAAA;IAAU,IAAA;EAAA;EACV,OAAA,GAAU,MAAM;AAAA;AAAA,UAGD,mBAAA;EACf,UAAU;AAAA;AAAA,KAGA,WAAA,IAAe,GAAa;AAAA,UAEvB,yBAAA;EACf,QAAA,cAAsB,OAAA,EAAS,kBAAA;EAC/B,oBAAA,GAAuB,oBAAA;EACvB,MAAA,IAAU,OAAA,EAAS,kBAAA,KAAuB,MAAA;EATR;EAWlC,QAAA;AAAA;AAAA,iBAqCc,SAAA,CACd,OAAA,GAAU,kBAAA,EACV,oBAAA,GAAuB,oBAAA,GACtB,aAAA;AA/CH;;;;AAAwC;AAAxC,iBA4DgB,WAAA,cACD,kBAAA,eACA,mBAAA,WAGb,OAAA,GAAU,GAAA,EAAK,IAAA,EAAM,GAAA,EAAK,IAAA,EAAM,IAAA,GAAO,WAAA,KAAgB,OAAA,GAAU,OAAA,CAAQ,OAAA,GACzE,OAAA,GAAU,yBAAA,IACR,GAAA,EAAK,IAAA,EAAM,GAAA,EAAK,IAAA,EAAM,IAAA,GAAO,WAAA,KAAgB,OAAA,CAAQ,OAAA;AAAA,iBAwCzC,oBAAA,CAAqB,OAAA,GAAU,yBAAA;6BAG5B,kBAAA,eACA,mBAAA,WACN,OAAA,GAGL,GAAA,EAAK,IAAA,EACL,GAAA,EAAK,IAAA,EACL,IAAA,GAAO,WAAA,KACJ,OAAA,GAAU,OAAA,CAAQ,OAAA,OAAQ,GAAA,EAAA,IAAA,EAAA,GAAA,EAAA,IAAA,EAAA,IAAA,GAnDJ,WAAA,KAAW,OAAA,CAAA,OAAA;;kCAsDV,WAAA;iCACC,oBAAA,KAAuB,eAAA;qCAE/B,YAAA,GACN,oBAAA,CAAqB,CAAA,QACjC,UAAA,GAAa,KAAA,EAAO,CAAA,cAAe,OAAA,WAAkB,eAAA,CAAgB,CAAA;AAAA;AAAA,cAKjE,cAAA,EAAc,cAAA,CAAA,kBAAA"}
package/dist/express.js CHANGED
@@ -1,4 +1,79 @@
1
- export { createDrainPipeline, createExpressAdapter, createStructuredError, expressToolkit, parseError, useLogger, withAutotel } from './chunk-2YPL66HM.js';
2
- import './chunk-DJ2OU3S6.js';
3
- //# sourceMappingURL=express.js.map
1
+ import { createAdapterToolkit, createRequestRunner, createUseLogger } from "./core.js";
2
+ import { createDrainPipeline, createStructuredError, parseError } from "autotel";
3
+ import { AsyncLocalStorage } from "node:async_hooks";
4
+
5
+ //#region src/express.ts
6
+ const expressLoggerStorage = new AsyncLocalStorage();
7
+ function headerValue(headers, name) {
8
+ if (!headers) return void 0;
9
+ const value = headers[name] ?? headers[name.toLowerCase()];
10
+ if (Array.isArray(value)) return value[0];
11
+ return typeof value === "string" ? value : void 0;
12
+ }
13
+ function enrichFromRequest(request) {
14
+ if (!request) return void 0;
15
+ const url = request.originalUrl ?? request.url;
16
+ const route = request.route?.path ?? request.path ?? url;
17
+ const requestId = headerValue(request.headers, "x-request-id");
18
+ return {
19
+ ...request.method ? { "http.request.method": request.method } : {},
20
+ ...url ? { "url.full": url } : {},
21
+ ...route ? { "http.route": route } : {},
22
+ ...requestId ? { "http.request.id": requestId } : {}
23
+ };
24
+ }
25
+ const baseUseLogger = createUseLogger({
26
+ adapterName: "express",
27
+ enrich: enrichFromRequest
28
+ });
29
+ function useLogger(request, requestLoggerOptions) {
30
+ const stored = expressLoggerStorage.getStore();
31
+ if (stored) return stored;
32
+ return baseUseLogger(request, requestLoggerOptions);
33
+ }
34
+ const runRequest = createRequestRunner(expressLoggerStorage);
35
+ /**
36
+ * Wrap an Express route handler. Each request opens a span, gets a
37
+ * request-scoped logger (via `useLogger(req)`), and emits one wide event when
38
+ * the handler settles. Thrown errors are recorded and forwarded to `next`.
39
+ */
40
+ function withAutotel(handler, options) {
41
+ return async (req, res, next) => {
42
+ const spanName = typeof options?.spanName === "function" ? options.spanName(req) : options?.spanName ?? `express.${req.method ?? "request"}`;
43
+ try {
44
+ return await runRequest(spanName, (log) => {
45
+ const auto = enrichFromRequest(req);
46
+ if (auto && Object.keys(auto).length > 0) log.set(auto);
47
+ const custom = options?.enrich?.(req);
48
+ if (custom && Object.keys(custom).length > 0) log.set(custom);
49
+ }, () => handler(req, res, next), {
50
+ requestLoggerOptions: options?.requestLoggerOptions,
51
+ autoEmit: options?.autoEmit,
52
+ finalize: () => res.statusCode ? { "http.response.status_code": res.statusCode } : void 0
53
+ });
54
+ } catch (error) {
55
+ if (typeof next === "function") {
56
+ next(error);
57
+ return;
58
+ }
59
+ throw error;
60
+ }
61
+ };
62
+ }
63
+ function createExpressAdapter(options) {
64
+ return {
65
+ withAutotel: (handler) => withAutotel(handler, options),
66
+ useLogger,
67
+ parseError: (error) => parseError(error),
68
+ createStructuredError: (input) => createStructuredError(input),
69
+ createDrainPipeline: (drainOptions) => createDrainPipeline(drainOptions)
70
+ };
71
+ }
72
+ const expressToolkit = createAdapterToolkit({
73
+ adapterName: "express",
74
+ enrich: enrichFromRequest
75
+ });
76
+
77
+ //#endregion
78
+ export { createDrainPipeline, createExpressAdapter, createStructuredError, expressToolkit, parseError, useLogger, withAutotel };
4
79
  //# sourceMappingURL=express.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":[],"names":[],"mappings":"","file":"express.js"}
1
+ {"version":3,"file":"express.js","names":[],"sources":["../src/express.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport {\n createDrainPipeline,\n createStructuredError,\n parseError,\n type DrainPipelineOptions,\n type ParsedError,\n type PipelineDrainFn,\n type RequestLogger,\n type RequestLoggerOptions,\n type StructuredError,\n type StructuredErrorInput,\n} from 'autotel';\nimport {\n createAdapterToolkit,\n createRequestRunner,\n createUseLogger,\n} from './core';\n\nexport interface ExpressRequestLike {\n method?: string;\n originalUrl?: string;\n url?: string;\n path?: string;\n route?: { path?: string };\n headers?: Record<string, string | string[] | undefined>;\n}\n\nexport interface ExpressResponseLike {\n statusCode?: number;\n}\n\nexport type ExpressNext = (err?: unknown) => void;\n\nexport interface ExpressWithAutotelOptions {\n spanName?: string | ((request: ExpressRequestLike) => string);\n requestLoggerOptions?: RequestLoggerOptions;\n enrich?: (request: ExpressRequestLike) => Record<string, unknown> | undefined;\n /** Emit one wide event automatically when the handler settles. Default `true`. */\n autoEmit?: boolean;\n}\n\nconst expressLoggerStorage = new AsyncLocalStorage<RequestLogger>();\n\nfunction headerValue(\n headers: ExpressRequestLike['headers'],\n name: string,\n): string | undefined {\n if (!headers) return undefined;\n const value = headers[name] ?? headers[name.toLowerCase()];\n if (Array.isArray(value)) return value[0];\n return typeof value === 'string' ? value : undefined;\n}\n\nfunction enrichFromRequest(\n request?: ExpressRequestLike,\n): Record<string, unknown> | undefined {\n if (!request) return undefined;\n\n const url = request.originalUrl ?? request.url;\n const route = request.route?.path ?? request.path ?? url;\n const requestId = headerValue(request.headers, 'x-request-id');\n\n return {\n ...(request.method ? { 'http.request.method': request.method } : {}),\n ...(url ? { 'url.full': url } : {}),\n ...(route ? { 'http.route': route } : {}),\n ...(requestId ? { 'http.request.id': requestId } : {}),\n };\n}\n\nconst baseUseLogger = createUseLogger<ExpressRequestLike>({\n adapterName: 'express',\n enrich: enrichFromRequest,\n});\n\nexport function useLogger(\n request?: ExpressRequestLike,\n requestLoggerOptions?: RequestLoggerOptions,\n): RequestLogger {\n const stored = expressLoggerStorage.getStore();\n if (stored) return stored;\n return baseUseLogger(request, requestLoggerOptions);\n}\n\nconst runRequest = createRequestRunner(expressLoggerStorage);\n\n/**\n * Wrap an Express route handler. Each request opens a span, gets a\n * request-scoped logger (via `useLogger(req)`), and emits one wide event when\n * the handler settles. Thrown errors are recorded and forwarded to `next`.\n */\nexport function withAutotel<\n TReq extends ExpressRequestLike,\n TRes extends ExpressResponseLike,\n TReturn,\n>(\n handler: (req: TReq, res: TRes, next?: ExpressNext) => TReturn | Promise<TReturn>,\n options?: ExpressWithAutotelOptions,\n): (req: TReq, res: TRes, next?: ExpressNext) => Promise<TReturn | undefined> {\n return async (\n req: TReq,\n res: TRes,\n next?: ExpressNext,\n ): Promise<TReturn | undefined> => {\n const spanName =\n typeof options?.spanName === 'function'\n ? options.spanName(req)\n : (options?.spanName ?? `express.${req.method ?? 'request'}`);\n\n try {\n return await runRequest<TReturn>(\n spanName,\n (log) => {\n const auto = enrichFromRequest(req);\n if (auto && Object.keys(auto).length > 0) log.set(auto);\n const custom = options?.enrich?.(req);\n if (custom && Object.keys(custom).length > 0) log.set(custom);\n },\n () => handler(req, res, next),\n {\n requestLoggerOptions: options?.requestLoggerOptions,\n autoEmit: options?.autoEmit,\n finalize: () =>\n res.statusCode\n ? { 'http.response.status_code': res.statusCode }\n : undefined,\n },\n );\n } catch (error) {\n if (typeof next === 'function') {\n next(error);\n return undefined;\n }\n throw error;\n }\n };\n}\n\nexport function createExpressAdapter(options?: ExpressWithAutotelOptions) {\n return {\n withAutotel: <\n TReq extends ExpressRequestLike,\n TRes extends ExpressResponseLike,\n TReturn,\n >(\n handler: (\n req: TReq,\n res: TRes,\n next?: ExpressNext,\n ) => TReturn | Promise<TReturn>,\n ) => withAutotel(handler, options),\n useLogger,\n parseError: (error: unknown): ParsedError => parseError(error),\n createStructuredError: (input: StructuredErrorInput): StructuredError =>\n createStructuredError(input),\n createDrainPipeline: <T = unknown>(\n drainOptions?: DrainPipelineOptions<T>,\n ): ((batchDrain: (batch: T[]) => void | Promise<void>) => PipelineDrainFn<T>) =>\n createDrainPipeline(drainOptions),\n };\n}\n\nexport const expressToolkit = createAdapterToolkit<ExpressRequestLike>({\n adapterName: 'express',\n enrich: enrichFromRequest,\n});\n\nexport { parseError, createDrainPipeline, createStructuredError };\n"],"mappings":";;;;;AA0CA,MAAM,uBAAuB,IAAI,kBAAiC;AAElE,SAAS,YACP,SACA,MACoB;CACpB,IAAI,CAAC,SAAS,OAAO;CACrB,MAAM,QAAQ,QAAQ,SAAS,QAAQ,KAAK,YAAY;CACxD,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM;CACvC,OAAO,OAAO,UAAU,WAAW,QAAQ;AAC7C;AAEA,SAAS,kBACP,SACqC;CACrC,IAAI,CAAC,SAAS,OAAO;CAErB,MAAM,MAAM,QAAQ,eAAe,QAAQ;CAC3C,MAAM,QAAQ,QAAQ,OAAO,QAAQ,QAAQ,QAAQ;CACrD,MAAM,YAAY,YAAY,QAAQ,SAAS,cAAc;CAE7D,OAAO;EACL,GAAI,QAAQ,SAAS,EAAE,uBAAuB,QAAQ,OAAO,IAAI,CAAC;EAClE,GAAI,MAAM,EAAE,YAAY,IAAI,IAAI,CAAC;EACjC,GAAI,QAAQ,EAAE,cAAc,MAAM,IAAI,CAAC;EACvC,GAAI,YAAY,EAAE,mBAAmB,UAAU,IAAI,CAAC;CACtD;AACF;AAEA,MAAM,gBAAgB,gBAAoC;CACxD,aAAa;CACb,QAAQ;AACV,CAAC;AAED,SAAgB,UACd,SACA,sBACe;CACf,MAAM,SAAS,qBAAqB,SAAS;CAC7C,IAAI,QAAQ,OAAO;CACnB,OAAO,cAAc,SAAS,oBAAoB;AACpD;AAEA,MAAM,aAAa,oBAAoB,oBAAoB;;;;;;AAO3D,SAAgB,YAKd,SACA,SAC4E;CAC5E,OAAO,OACL,KACA,KACA,SACiC;EACjC,MAAM,WACJ,OAAO,SAAS,aAAa,aACzB,QAAQ,SAAS,GAAG,IACnB,SAAS,YAAY,WAAW,IAAI,UAAU;EAErD,IAAI;GACF,OAAO,MAAM,WACX,WACC,QAAQ;IACP,MAAM,OAAO,kBAAkB,GAAG;IAClC,IAAI,QAAQ,OAAO,KAAK,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,IAAI;IACtD,MAAM,SAAS,SAAS,SAAS,GAAG;IACpC,IAAI,UAAU,OAAO,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,MAAM;GAC9D,SACM,QAAQ,KAAK,KAAK,IAAI,GAC5B;IACE,sBAAsB,SAAS;IAC/B,UAAU,SAAS;IACnB,gBACE,IAAI,aACA,EAAE,6BAA6B,IAAI,WAAW,IAC9C;GACR,CACF;EACF,SAAS,OAAO;GACd,IAAI,OAAO,SAAS,YAAY;IAC9B,KAAK,KAAK;IACV;GACF;GACA,MAAM;EACR;CACF;AACF;AAEA,SAAgB,qBAAqB,SAAqC;CACxE,OAAO;EACL,cAKE,YAKG,YAAY,SAAS,OAAO;EACjC;EACA,aAAa,UAAgC,WAAW,KAAK;EAC7D,wBAAwB,UACtB,sBAAsB,KAAK;EAC7B,sBACE,iBAEA,oBAAoB,YAAY;CACpC;AACF;AAEA,MAAa,iBAAiB,qBAAyC;CACrE,aAAa;CACb,QAAQ;AACV,CAAC"}