@weifuwujs/weifuwu 1.1.0 → 1.2.0

package/README.md

@@ -41,7 +41,7 @@ auth / tasks / messages / 单源 API 已全部外迁为独立包（`@weifuwujs/*
 - **WebSocket**：基于 `ws` 的服务端实现（握手 / 分片 / 关闭 / ping-pong 由成熟内核承担），与路由、参数、中间件风格一致。
 - **数据资源**：`resource` 内核 + `./postgres`、`./ioredis` 子路径（懒加载 `ctx.sql` / `ctx.redis`、优雅关闭），见 [docs/data.md](./docs/data.md)。
 - **AI 集成**：用 `resource` 注入模型注册表（`ctx.ai`），`streamText` 流式 Response 直接返回；含 `useChat`、结构化输出、错误映射与 embedding 缓存配方，见 [docs/ai.md](./docs/ai.md)。
-- **内置中间件**：logger、cors、serveStatic。
+- **内置中间件**：requestId、logger、cors、serveStatic。
 - **默认样式管线**：脚手架（`init`）自带 Tailwind CSS v4（`@tailwindcss/vite`），dev/prod 一致；shadcn/ui 接入见 [docs/styling.md](./docs/styling.md)。
 - **原生 TypeScript**：Node 24+ 可直接运行 `.ts` 源码；发布产物为 ESM + `.d.ts`。
 
@@ -331,9 +331,52 @@ app.notFound((req) => json({ error: 'Not Found' }, { status: 404 }))
 从子路径导入，避免核心包引入 `node:fs`：
 
 ```ts
-import { logger, cors, serveStatic } from '@weifuwujs/weifuwu/middleware'
+import { logger, requestId, cors, serveStatic } from '@weifuwujs/weifuwu/middleware'
 ```
 
+### `requestId(options?)`
+
+为每个请求生成或透传关联 id：写入 `ctx.requestId`，并回显到响应头（失败响应也会带上）。
+
+| 选项 | 类型 | 默认值 | 说明 |
+| --- | --- | --- | --- |
+| `header` | `string` | `'x-request-id'` | 读入与回显的头名 |
+| `generator` | `() => string` | `crypto.randomUUID()` | 无合法入站 id 时的生成器 |
+
+入站头必须匹配 `[A-Za-z0-9._-]{1,64}`，否则重新生成（防日志注入）；未挂载时行为与之前完全一致。
+
+#### 请求 id 与结构化日志
+
+推荐直接用 JSON 模式（单行、固定键序、自动带 `rid`）：
+
+```ts
+app.use(requestId())
+app.use(logger({ json: true }))
+```
+
+需要自定义字段时可写 `format`（下方与 `logger` 节等效）：
+```ts
+app.use(requestId())
+app.use(logger({
+  format: (info) => JSON.stringify({
+    rid: info.requestId,
+    method: info.method,
+    path: info.path,
+    status: info.status,
+    duration: info.duration,
+  }),
+}))
+```
+
+```bash
+curl -i http://localhost:3000/hello
+# x-request-id: 8f2a...（未带则生成；合法上游 id 原样透传）
+# {"rid":"8f2a...","method":"GET","path":"/hello","status":200,"duration":0.8}
+```
+
+反向代理（nginx / 网关）生成的 `x-request-id` 会经该中间件透传，应用日志可与上游访问日志对齐。
+handler 抛错时同一 rid 会出现在失败响应头与该请求的日志行中，便于从 500 关联到原始 `error`。
+
 ### `logger(options?)`
 
 输出访问日志，默认格式 `GET /path 200 1.2ms`。
@@ -341,10 +384,25 @@ import { logger, cors, serveStatic } from '@weifuwujs/weifuwu/middleware'
 | 选项 | 类型 | 说明 |
 | --- | --- | --- |
 | `log` | `(message: string) => void` | 输出函数，默认 `console.log` |
-| `format` | `(info: LogInfo) => string` | 自定义格式 |
+| `format` | `(info: LogInfo) => string` | 自定义格式（显式提供时优先于 `json`） |
+| `json` | `boolean` | `true` 且未提供 `format` 时输出单行 JSON |
+
+`LogInfo` 包含 `time`（ISO）/ `method` / `path` / `status` / `duration` / `request` /
+`response` / `requestId`（挂载 `requestId()` 时），handler 抛错时还带 `error`（原始错误）。
+
+日志采集器接入用 `json: true`：单行、固定键序 `time/method/path/status/duration/rid?/error?`
+（`rid` 来自 `requestId()`，`error` 仅失败时出现且只收敛为 `{ name, message }`）：
+
+```ts
+app.use(requestId())
+app.use(logger({ json: true }))
+```
+
+```json
+{"time":"2026-10-04T12:00:00.000Z","method":"GET","path":"/hello","status":200,"duration":1.2,"rid":"8f2a..."}
+```
 
-`LogInfo` 包含 `method` / `path` / `status` / `duration` / `request` /
-`response`，handler 抛错时还带 `error`（原始错误），可据此做结构化日志：
+需要额外字段时仍可用 `format`（可读 `LogInfo.error`/`requestId` 做自定义结构化）：
 
 ```ts
 app.use(logger({ format: (info) => JSON.stringify({ ...info, error: undefined, message: info.error instanceof Error ? info.error.message : undefined }) }))
@@ -584,7 +642,7 @@ src/
   cli.ts          weifuwu CLI：init / dev / build / start / typegen / routes
   react-router.ts React Router SSR 中间件（虚拟模块加载 build）
   vite.ts         defineConfig：注册 RR 插件与 SSR 入口
-  middleware/     logger / cors / serveStatic
+  middleware/     requestId / logger / cors / serveStatic
   websocket/      基于 ws：握手校验、连接适配、关闭码
 test/             node:test 测试（含类型级断言）
 examples/         basic.ts / rest.ts / websocket.ts / react-router

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,MAAM,WAAW,CAAA;AACnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAMlC,OAAO,KAAK,EACV,OAAO,EACP,YAAY,EAEZ,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,WAAW,EACX,cAAc,EACf,MAAM,YAAY,CAAA;AAKnB,OAAO,KAAK,EAGV,mBAAmB,EAEnB,WAAW,EACZ,MAAM,sBAAsB,CAAA;AAkB7B;;;;;;;;GAQG;AACH,qBAAa,GAAG,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;;IAU1C;;;;;;;;;;OAUG;IACH,GAAG,CAAC,GAAG,SAAS,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;IAC3E,uBAAuB;IACvB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI;IAC3E,uBAAuB;IACvB,GAAG,CAAC,GAAG,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI;IAwB3D;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAKnD;;;;;;OAMG;IACH,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAS9B;IAED,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CACI;IAEpC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CACI;IAErC,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CACI;IAEpC,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CACI;IAEtC,MAAM,EAAE,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CACI;IAEvC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CACI;IAErC,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CACI;IAExC,oBAAoB;IACpB,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAG/B;IAED,mBAAmB;IACnB,EAAE,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAIY;IAExC;;;;;;;;;;;;;OAaG;IACH,EAAE,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAU3B;IAED,0CAA0C;IAC1C,KAAK,CAAC,GAAG,WAAW,EAAE,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI;IAKjE,8CAA8C;IAC9C,KAAK,CAAC,MAAM,SAAS,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,GACxC,IAAI;IAKP,kBAAkB;IAClB,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,IAAI;IAK3C,gBAAgB;IAChB,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI;IAKvC;;;;;;OAMG;IACH,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,GAAE,YAAiB,GAAG,IAAI;IA0B7D,gEAAgE;IAChE,KAAK,GAAU,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CA6ElD;IAED;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,OAAO,GACd,SAAS,OAAO,EAChB,QAAQ,MAAM,EACd,OAAO,UAAU,EACjB,aAAa,eAAe,KAC3B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CA8D/B;IAsGD,yCAAyC;IACzC,OAAO,GAAI,OAAO,MAAM,GAAG,GAAG,GAAG,OAAO,EAAE,OAAO,WAAW,KAAG,OAAO,CAAC,QAAQ,CAAC,CAK/E;IAED,mCAAmC;IACnC,IAAI,OAAO,IAAI,eAAe,CAE7B;IAED,uDAAuD;IACvD,MAAM,GAAI,QAAQ,MAAM,KAAG,MAAM,CAEhC;IAED;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE;QACf,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,MAAM,CAAA;QAC9C,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,MAAM,CAAA;KAChE,CAaA;CAgBF;AAgFD,WAAW;AACX,wBAAgB,SAAS,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,CAE/D"}

package/dist/app.js

@@ -222,21 +222,28 @@ export class App {
                 '（WS 专用中间件请注册到 app.wsUse / app.ws）');
         }
         catch (error) {
+            let response;
             const errorHandler = this.#errorHandler;
             if (errorHandler) {
                 try {
-                    const response = await errorHandler(error, request, ctx);
-                    if (response)
-                        return response;
+                    const handled = await errorHandler(error, request, ctx);
+                    if (handled)
+                        response = handled;
                 }
                 catch (nested) {
                     console.error(nested);
                 }
             }
-            if (error instanceof HttpError)
-                return error.toResponse();
-            console.error(error);
-            return new Response('Internal Server Error', { status: 500 });
+            if (!response) {
+                if (error instanceof HttpError) {
+                    response = error.toResponse();
+                }
+                else {
+                    console.error(error);
+                    response = new Response('Internal Server Error', { status: 500 });
+                }
+            }
+            return withRequestId(response, ctx);
         }
     };
     /**
@@ -435,6 +442,17 @@ function queryFromURL(url) {
     }
     return query;
 }
+/**
+ * `requestId()` 挂载时，失败响应也回显默认头；成功路径由中间件自己回显。
+ * 只识别默认头名：自定义头名不进内核（见 plan/request-context.md 设计）。
+ */
+function withRequestId(response, ctx) {
+    const id = ctx.requestId;
+    if (typeof id === 'string' && !response.headers.has('x-request-id')) {
+        response.headers.set('x-request-id', id);
+    }
+    return response;
+}
 function splitWsArgs(args) {
     const list = [...args];
     const handler = list.pop();

package/dist/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}

package/dist/middleware/index.d.ts

@@ -4,4 +4,6 @@ export { cors } from './cors.ts';
 export type { CorsOptions, CorsOrigin } from './cors.ts';
 export { serveStatic } from './static.ts';
 export type { ServeStaticOptions } from './static.ts';
+export { requestId } from './request-id.ts';
+export type { RequestIdOptions } from './request-id.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/middleware/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA"}

package/dist/middleware/index.js

@@ -1,4 +1,5 @@
 export { logger } from "./logger.js";
 export { cors } from "./cors.js";
 export { serveStatic } from "./static.js";
+export { requestId } from "./request-id.js";
 //# sourceMappingURL=index.js.map

package/dist/middleware/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA"}

package/dist/middleware/logger.d.ts

@@ -1,5 +1,7 @@
 import type { Middleware } from '../types.ts';
 export interface LogInfo {
+    /** ISO 时间戳（成功为响应时刻，失败为抛出时刻） */
+    time: string;
     method: string;
     path: string;
     status: number;
@@ -9,12 +11,16 @@ export interface LogInfo {
     response?: Response;
     /** handler 抛出的原始错误（仅失败时有值） */
     error?: unknown;
+    /** `requestId()` 注入的关联 id（未挂载时无值） */
+    requestId?: string;
 }
 export interface LoggerOptions {
     /** 输出函数，默认 `console.log` */
     log?: (message: string) => void;
-    /** 自定义日志格式 */
+    /** 自定义日志格式（显式提供时优先于 `json`） */
     format?: (info: LogInfo) => string;
+    /** `true` 且未提供 `format` 时输出单行 JSON（固定键序，见 `jsonFormat`） */
+    json?: boolean;
 }
 /**
  * 访问日志中间件。

package/dist/middleware/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,SAAS;IACT,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,8BAA8B;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,4BAA4B;IAC5B,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/B,cAAc;IACd,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAA;CACnC;AAKD;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,OAAO,GAAE,aAAkB,GAAG,UAAU,CAmC9D"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,MAAM,WAAW,OAAO;IACtB,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,SAAS;IACT,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,8BAA8B;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,4BAA4B;IAC5B,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/B,+BAA+B;IAC/B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAA;IAClC,2DAA2D;IAC3D,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AA8BD;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,OAAO,GAAE,aAAkB,GAAG,UAAU,CAwC9D"}

package/dist/middleware/logger.js

@@ -1,4 +1,30 @@
-const defaultFormat = (info) => `${info.method} ${info.path} ${info.status} ${info.duration.toFixed(1)}ms`;
+const defaultFormat = (info) => `${info.method} ${info.path} ${info.status} ${info.duration.toFixed(1)}ms` +
+    (info.requestId ? ` rid=${info.requestId}` : '');
+/** 错误收敛为可入库摘要：不导出 stack / 原始对象 */
+function summarizeError(error) {
+    if (error instanceof Error)
+        return { name: error.name, message: error.message };
+    return { name: 'UnknownError', message: String(error) };
+}
+/**
+ * JSON 日志格式：单行、固定键序 `time/method/path/status/duration/rid?/error?`；
+ * `rid` 仅挂载 `requestId()` 时出现，`error` 仅失败时出现。`JSON.stringify`
+ * 保证换行被转义（日志采集器按行切分不破行）。
+ */
+function jsonFormat(info) {
+    const entry = {
+        time: info.time,
+        method: info.method,
+        path: info.path,
+        status: info.status,
+        duration: info.duration,
+    };
+    if (info.requestId)
+        entry.rid = info.requestId;
+    if (info.error !== undefined)
+        entry.error = summarizeError(info.error);
+    return JSON.stringify(entry);
+}
 /**
  * 访问日志中间件。
  *
@@ -8,30 +34,35 @@ const defaultFormat = (info) => `${info.method} ${info.path} ${info.status} ${in
  */
 export function logger(options = {}) {
     const log = options.log ?? ((message) => console.log(message));
-    const format = options.format ?? defaultFormat;
+    const format = options.format ?? (options.json ? jsonFormat : defaultFormat);
     return async (req, ctx, next) => {
         const start = performance.now();
         const path = pathOf(req.url);
+        const rid = typeof ctx.requestId === 'string' ? ctx.requestId : undefined;
         try {
             const response = await next(req, ctx);
             log(format({
+                time: new Date().toISOString(),
                 method: req.method,
                 path,
                 status: response.status,
                 duration: performance.now() - start,
                 request: req,
                 response,
+                requestId: rid,
             }));
             return response;
         }
         catch (error) {
             log(format({
+                time: new Date().toISOString(),
                 method: req.method,
                 path,
                 status: 500,
                 duration: performance.now() - start,
                 request: req,
                 error,
+                requestId: rid,
             }));
             throw error;
         }

package/dist/middleware/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAqBA,MAAM,aAAa,GAAG,CAAC,IAAa,EAAU,EAAE,CAC9C,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAA;AAE5E;;;;;;GAMG;AACH,MAAM,UAAU,MAAM,CAAC,UAAyB,EAAE;IAChD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,OAAe,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;IACtE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,aAAa,CAAA;IAE9C,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC9B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;QAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE5B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YACrC,GAAG,CACD,MAAM,CAAC;gBACL,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,IAAI;gBACJ,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK;gBACnC,OAAO,EAAE,GAAG;gBACZ,QAAQ;aACT,CAAC,CACH,CAAA;YACD,OAAO,QAAQ,CAAA;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CACD,MAAM,CAAC;gBACL,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,IAAI;gBACJ,MAAM,EAAE,GAAG;gBACX,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK;gBACnC,OAAO,EAAE,GAAG;gBACZ,KAAK;aACN,CAAC,CACH,CAAA;YACD,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC,CAAA;AACH,CAAC;AAED,SAAS,MAAM,CAAC,GAAW;IACzB,IAAI,CAAC;QACH,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,CAAA;IACZ,CAAC;AACH,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"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"}

package/dist/middleware/request-id.d.ts

@@ -0,0 +1,26 @@
+import type { Middleware } from '../types.ts';
+declare module '../types.ts' {
+    interface Context {
+        /** `requestId()` 注入的请求关联 id；未挂载该中间件时为 `undefined` */
+        requestId?: string;
+    }
+}
+export interface RequestIdOptions {
+    /** 读入与回显的请求头名，默认 `x-request-id` */
+    header?: string;
+    /** 自定义生成器，默认 `crypto.randomUUID()` */
+    generator?: () => string;
+}
+/**
+ * 请求关联 id 中间件。
+ *
+ * ```ts
+ * app.use(requestId())
+ * ```
+ *
+ * - 入站 `x-request-id` 合法（`[A-Za-z0-9._-]{1,64}`）则原样透传，否则重新生成；
+ * - id 写入 `ctx.requestId`，并回显到响应头（失败响应由内核 catch 统一补头）；
+ * - 默认日志格式在 `LogInfo.requestId` 存在时追加 ` rid=<id>`。
+ */
+export declare function requestId(options?: RequestIdOptions): Middleware;
+//# sourceMappingURL=request-id.d.ts.map

package/dist/middleware/request-id.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-id.d.ts","sourceRoot":"","sources":["../../src/middleware/request-id.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAU,OAAO;QACf,qDAAqD;QACrD,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB;CACF;AAED,MAAM,WAAW,gBAAgB;IAC/B,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,MAAM,CAAA;CACzB;AAKD;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,UAAU,CAapE"}

package/dist/middleware/request-id.js

@@ -0,0 +1,27 @@
+import { randomUUID } from 'node:crypto';
+/** 入站 id 白名单：防日志注入与头污染（超长/空白/换行/非 ASCII 一律重生成） */
+const VALID_ID = /^[A-Za-z0-9._-]{1,64}$/;
+/**
+ * 请求关联 id 中间件。
+ *
+ * ```ts
+ * app.use(requestId())
+ * ```
+ *
+ * - 入站 `x-request-id` 合法（`[A-Za-z0-9._-]{1,64}`）则原样透传，否则重新生成；
+ * - id 写入 `ctx.requestId`，并回显到响应头（失败响应由内核 catch 统一补头）；
+ * - 默认日志格式在 `LogInfo.requestId` 存在时追加 ` rid=<id>`。
+ */
+export function requestId(options = {}) {
+    const header = options.header ?? 'x-request-id';
+    const generate = options.generator ?? (() => randomUUID());
+    return async (req, ctx, next) => {
+        const incoming = req.headers.get(header)?.trim();
+        const id = incoming && VALID_ID.test(incoming) ? incoming : generate();
+        ctx.requestId = id;
+        const response = await next(req, ctx);
+        response.headers.set(header, id);
+        return response;
+    };
+}
+//# sourceMappingURL=request-id.js.map

package/dist/middleware/request-id.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-id.js","sourceRoot":"","sources":["../../src/middleware/request-id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAiBxC,kDAAkD;AAClD,MAAM,QAAQ,GAAG,wBAAwB,CAAA;AAEzC;;;;;;;;;;GAUG;AACH,MAAM,UAAU,SAAS,CAAC,UAA4B,EAAE;IACtD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,cAAc,CAAA;IAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,CAAA;IAE1D,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAA;QAChD,MAAM,EAAE,GAAG,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;QACtE,GAAG,CAAC,SAAS,GAAG,EAAE,CAAA;QAElB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QACrC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAChC,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weifuwujs/weifuwu",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A minimal, type-safe fetch full-stack kernel for Node.js: routing, middleware, WebSocket, resources, React Router SSR and CLI.",
   "type": "module",
   "workspaces": [