@lsby/net-core 0.10.2 → 0.11.2

package/dist/cjs/index.cjs

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   EXPORT_TYPE: () => EXPORT_TYPE,
+  Express\u517C\u5BB9\u63A5\u53E3\u5C01\u88C5: () => Express\u517C\u5BB9\u63A5\u53E3\u5C01\u88C5,
   GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6: () => GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
   JSON\u89E3\u6790\u63D2\u4EF6: () => JSON\u89E3\u6790\u63D2\u4EF6,
   WebSocket\u63D2\u4EF6: () => WebSocket\u63D2\u4EF6,
@@ -46,6 +47,7 @@ __export(index_exports, {
   \u63A5\u53E3\u903B\u8F91: () => \u63A5\u53E3\u903B\u8F91,
   \u63A5\u53E3\u903B\u8F91Base: () => \u63A5\u53E3\u903B\u8F91Base,
   \u63D2\u4EF6: () => \u63D2\u4EF6,
+  \u6587\u4EF6\u4E0B\u8F7D\u63A5\u53E3\u5C01\u88C5: () => \u6587\u4EF6\u4E0B\u8F7D\u63A5\u53E3\u5C01\u88C5,
   \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76: () => \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76,
   \u670D\u52A1\u5668: () => \u670D\u52A1\u5668,
   \u6784\u9020\u5143\u7EC4: () => \u6784\u9020\u5143\u7EC4,
@@ -550,8 +552,8 @@ var import_node_os = require("os");
 var import_short_uuid = __toESM(require("short-uuid"), 1);
 var import_ws3 = require("ws");
 var \u670D\u52A1\u5668 = class {
-  \u63A5\u53E3log;
-  \u7CFB\u7EDFlog;
+  log;
+  \u65E5\u5FD7\u56DE\u8C03;
   \u63A5\u53E3\u4EEC;
   \u7AEF\u53E3;
   \u9759\u6001\u8D44\u6E90\u8DEF\u5F84;
@@ -561,14 +563,17 @@ var \u670D\u52A1\u5668 = class {
     this.\u7AEF\u53E3 = options.\u7AEF\u53E3;
     this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 = options.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84;
     this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84 = options.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84;
-    this.\u7CFB\u7EDFlog = options.\u7CFB\u7EDFlog !== void 0 ? Promise.resolve(options.\u7CFB\u7EDFlog) : Global.getItem("log");
-    this.\u63A5\u53E3log = options.\u63A5\u53E3log !== void 0 ? Promise.resolve(options.\u63A5\u53E3log) : Global.getItem("log");
+    this.\u65E5\u5FD7\u56DE\u8C03 = options.\u65E5\u5FD7\u56DE\u8C03;
+    this.log = Global.getItem("log").then((a) => {
+      if (this.\u65E5\u5FD7\u56DE\u8C03 !== void 0) a.pipe(this.\u65E5\u5FD7\u56DE\u8C03);
+      return a;
+    });
   }
   async run() {
+    let log2 = await this.log;
     let app = (0, import_express3.default)();
-    let \u7CFB\u7EDFlog = await this.\u7CFB\u7EDFlog;
     if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
-      await \u7CFB\u7EDFlog.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
+      await log2.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
       app.use(import_express3.default.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
     }
     app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
@@ -578,17 +583,16 @@ var \u670D\u52A1\u5668 = class {
   }
   async \u5904\u7406\u8BF7\u6C42(req, res) {
     let \u8BF7\u6C42id = (0, import_short_uuid.default)().new();
-    let \u7CFB\u7EDFlog = (await this.\u7CFB\u7EDFlog).extend(\u8BF7\u6C42id);
-    let \u63A5\u53E3log = (await this.\u63A5\u53E3log).extend(\u8BF7\u6C42id);
+    let log2 = (await this.log).extend(\u8BF7\u6C42id);
     let \u5F00\u59CB\u65F6\u95F4 = Date.now();
     try {
       let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
       \u8BF7\u6C42\u8DEF\u5F84 = decodeURIComponent(\u8BF7\u6C42\u8DEF\u5F84);
       let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
-      await \u7CFB\u7EDFlog.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
+      await log2.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
       let \u76EE\u6807\u63A5\u53E3 = this.\u63A5\u53E3\u4EEC.find((\u63A5\u53E32) => \u8BF7\u6C42\u65B9\u6CD5 === \u63A5\u53E32.\u83B7\u5F97\u65B9\u6CD5() && \u8BF7\u6C42\u8DEF\u5F84 === \u63A5\u53E32.\u83B7\u5F97\u8DEF\u5F84()) ?? null;
       if (\u76EE\u6807\u63A5\u53E3 !== null) {
-        await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u63A5\u53E3log, \u7CFB\u7EDFlog);
+        await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91({ req, res, \u76EE\u6807\u63A5\u53E3, log: log2, \u8BF7\u6C42id });
         return;
       }
       if (this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84 !== void 0 && \u8BF7\u6C42\u65B9\u6CD5 === "get") {
@@ -597,35 +601,36 @@ var \u670D\u52A1\u5668 = class {
           res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
           return;
         } catch (e) {
-          await \u7CFB\u7EDFlog.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
+          await log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
         }
       }
-      await \u7CFB\u7EDFlog.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
+      await log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
       res.status(404).end();
     } catch (error) {
-      await \u7CFB\u7EDFlog.error(error);
+      await log2.error(error);
       res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
     } finally {
       let \u8017\u65F6ms = Date.now() - \u5F00\u59CB\u65F6\u95F4;
-      await \u7CFB\u7EDFlog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
+      await log2.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
     }
   }
-  async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u63A5\u53E3log, \u7CFB\u7EDFlog) {
+  async \u5904\u7406\u63A5\u53E3\u903B\u8F91(opt) {
+    let { req, res, \u76EE\u6807\u63A5\u53E3, log: log2, \u8BF7\u6C42id } = opt;
     let \u63A5\u53E3\u903B\u8F912 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u903B\u8F91();
     let \u7ED3\u679C\u8F6C\u6362\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8F6C\u6362\u5668();
     let \u7ED3\u679C\u8FD4\u56DE\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8FD4\u56DE\u5668();
     let \u603B\u5F00\u59CB = Date.now();
     let \u5F00\u59CB = Date.now();
-    await \u7CFB\u7EDFlog.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
+    await log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
     let \u63D2\u4EF6\u4EEC = \u63A5\u53E3\u903B\u8F912.\u83B7\u5F97\u63D2\u4EF6\u4EEC();
-    await \u7CFB\u7EDFlog.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63D2\u4EF6\u4EEC.length);
-    let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, { log: \u7CFB\u7EDFlog });
-    await \u7CFB\u7EDFlog.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
-    await \u7CFB\u7EDFlog.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
-    let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u63D2\u4EF6\u7ED3\u679C, {}, { log: \u63A5\u53E3log });
-    await \u7CFB\u7EDFlog.debug("\u63A5\u53E3\u5B9E\u73B0\u6267\u884C\u5B8C\u6BD5");
+    await log2.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63D2\u4EF6\u4EEC.length);
+    let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, { log: log2, \u8BF7\u6C42id });
+    await log2.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
+    await log2.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
+    let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u63D2\u4EF6\u7ED3\u679C, {}, { log: log2, \u8BF7\u6C42id });
+    await log2.debug("\u63A5\u53E3\u5B9E\u73B0\u6267\u884C\u5B8C\u6BD5");
     let \u63A5\u53E3\u8017\u65F6 = Date.now() - \u5F00\u59CB;
-    await \u7CFB\u7EDFlog.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
+    await log2.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
     \u5F00\u59CB = Date.now();
     let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
     let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
@@ -637,59 +642,59 @@ var \u670D\u52A1\u5668 = class {
       \u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
     } else {
       let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
-      await \u7CFB\u7EDFlog.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
-      await \u7CFB\u7EDFlog.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
-      await \u7CFB\u7EDFlog.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
+      await log2.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
+      await log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
+      await log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
       throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
     }
     let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
-    await \u7CFB\u7EDFlog.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
-    await \u7CFB\u7EDFlog.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
+    await log2.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
+    await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
     \u5F00\u59CB = Date.now();
     await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
     let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
-    await \u7CFB\u7EDFlog.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
+    await log2.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
     let \u603B\u8017\u65F6 = Date.now() - \u603B\u5F00\u59CB;
-    await \u7CFB\u7EDFlog.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
+    await log2.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
   }
   async \u521D\u59CB\u5316WebSocket(server) {
+    let log2 = await this.log;
     let wss = new import_ws3.WebSocketServer({ server });
-    let \u7CFB\u7EDFlog = await this.\u7CFB\u7EDFlog;
     wss.on("listening", async () => {
-      await \u7CFB\u7EDFlog.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
+      await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
     });
     wss.on("error", async (err) => {
-      await \u7CFB\u7EDFlog.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
+      await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
     });
     wss.on("connection", async (ws, req) => {
-      let \u63A5\u53E3log = \u7CFB\u7EDFlog.extend((0, import_short_uuid.default)().new());
-      await \u63A5\u53E3log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
+      let \u8FDE\u63A5log = log2.extend((0, import_short_uuid.default)().new());
+      await \u8FDE\u63A5log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
       let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
       if (\u5BA2\u6237\u7AEFid === null) {
-        await \u63A5\u53E3log.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
-        return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u63A5\u53E3log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
+        await \u8FDE\u63A5log.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
+        return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u8FDE\u63A5log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
       }
-      await \u63A5\u53E3log.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
+      await \u8FDE\u63A5log.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
       let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
       let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
       if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
-        await \u63A5\u53E3log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
-        return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u63A5\u53E3log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
+        await \u8FDE\u63A5log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
+        return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u8FDE\u63A5log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
       }
       WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
-      await \u63A5\u53E3log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
+      await \u8FDE\u63A5log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
       ws.on("close", async () => {
-        await \u63A5\u53E3log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
+        await \u8FDE\u63A5log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
         WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
       });
       ws.on("error", async (err) => {
-        await \u63A5\u53E3log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
+        await \u8FDE\u63A5log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
         WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
       });
     });
   }
-  async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u63A5\u53E3log, code, reason) {
-    await \u63A5\u53E3log.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
+  async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, code, reason) {
+    await log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
     ws.close(code, reason);
   }
   \u83B7\u53D6\u672C\u5730\u5730\u5740() {
@@ -732,9 +737,96 @@ var \u5E38\u7528\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5 = class extends
     super(\u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5, \u63A5\u53E3\u903B\u8F912, \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F, \u63A5\u53E3\u6B63\u786E\u8F93\u51FA\u5F62\u5F0F, \u63A5\u53E3\u8F6C\u6362\u5668, new \u5E38\u7528\u8FD4\u56DE\u5668());
   }
 };
+
+// src/wrapper/express-compatible-wrapper.ts
+var import_ts_fp_data2 = require("@lsby/ts-fp-data");
+var import_zod9 = require("zod");
+var Express\u517C\u5BB9\u63A5\u53E3\u5C01\u88C5 = class extends \u63A5\u53E3 {
+  constructor(\u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5, \u5904\u7406\u51FD\u6570) {
+    let \u903B\u8F91 = \u63A5\u53E3\u903B\u8F91Base.\u6784\u9020([], async () => {
+      return new import_ts_fp_data2.Right({});
+    });
+    let \u8F6C\u6362\u5668 = new Express\u517C\u5BB9\u7ED3\u679C\u8F6C\u6362\u5668();
+    let \u8FD4\u56DE\u5668 = new Express\u517C\u5BB9\u8FD4\u56DE\u5668(\u5904\u7406\u51FD\u6570);
+    super(
+      \u8BF7\u6C42\u8DEF\u5F84,
+      \u8BF7\u6C42\u65B9\u6CD5,
+      \u903B\u8F91,
+      import_zod9.z.any(),
+      // 错误形式不做限制
+      import_zod9.z.any(),
+      // 正确形式不做限制
+      \u8F6C\u6362\u5668,
+      \u8FD4\u56DE\u5668
+    );
+  }
+};
+var Express\u517C\u5BB9\u7ED3\u679C\u8F6C\u6362\u5668 = class extends \u63A5\u53E3\u7ED3\u679C\u8F6C\u6362\u5668 {
+  \u5B9E\u73B0(\u6570\u636E) {
+    return \u6570\u636E;
+  }
+};
+var Express\u517C\u5BB9\u8FD4\u56DE\u5668 = class extends \u63A5\u53E3\u7ED3\u679C\u8FD4\u56DE\u5668 {
+  constructor(\u5904\u7406\u51FD\u6570) {
+    super();
+    this.\u5904\u7406\u51FD\u6570 = \u5904\u7406\u51FD\u6570;
+  }
+  \u8FD4\u56DE(req, res, _\u7ED3\u679C) {
+    return this.\u5904\u7406\u51FD\u6570(req, res);
+  }
+};
+
+// src/wrapper/file-download-wrapper.ts
+var import_node_fs = require("fs");
+var import_zod10 = require("zod");
+var \u6587\u4EF6\u4E0B\u8F7D\u63A5\u53E3\u5C01\u88C5 = class extends \u63A5\u53E3 {
+  constructor(\u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5, \u63A5\u53E3\u903B\u8F912, \u903B\u8F91\u9519\u8BEF\u7C7B\u578BZod, \u6587\u4EF6\u540D, MIME\u7C7B\u578B) {
+    let \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F = import_zod10.z.object({ status: import_zod10.z.literal("fail"), data: \u903B\u8F91\u9519\u8BEF\u7C7B\u578BZod });
+    let \u63A5\u53E3\u8F6C\u6362\u5668 = new \u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668();
+    let \u8FD4\u56DE\u5668 = new \u6587\u4EF6\u4E0B\u8F7D\u8FD4\u56DE\u5668(\u6587\u4EF6\u540D, MIME\u7C7B\u578B);
+    super(
+      \u8BF7\u6C42\u8DEF\u5F84,
+      \u8BF7\u6C42\u65B9\u6CD5,
+      \u63A5\u53E3\u903B\u8F912,
+      \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F,
+      import_zod10.z.any(),
+      // 正确形式任意
+      \u63A5\u53E3\u8F6C\u6362\u5668,
+      \u8FD4\u56DE\u5668
+    );
+  }
+};
+var \u6587\u4EF6\u4E0B\u8F7D\u8FD4\u56DE\u5668 = class extends \u63A5\u53E3\u7ED3\u679C\u8FD4\u56DE\u5668 {
+  constructor(\u6587\u4EF6\u540D, MIME\u7C7B\u578B) {
+    super();
+    this.\u6587\u4EF6\u540D = \u6587\u4EF6\u540D;
+    this.MIME\u7C7B\u578B = MIME\u7C7B\u578B;
+  }
+  async \u8FD4\u56DE(req, res, \u7ED3\u679C) {
+    if (this.MIME\u7C7B\u578B !== void 0) {
+      res.setHeader("Content-Type", this.MIME\u7C7B\u578B);
+    }
+    if (this.\u6587\u4EF6\u540D !== void 0) {
+      let encodedFilename = encodeURIComponent(this.\u6587\u4EF6\u540D);
+      res.setHeader("Content-Disposition", `attachment; filename*=UTF-8''${encodedFilename}`);
+    }
+    if (Buffer.isBuffer(\u7ED3\u679C)) {
+      res.setHeader("Content-Length", \u7ED3\u679C.length);
+      res.send(\u7ED3\u679C);
+    } else if (typeof \u7ED3\u679C === "string") {
+      let \u6D41 = (0, import_node_fs.createReadStream)(\u7ED3\u679C);
+      \u6D41.pipe(res);
+    } else if (typeof \u7ED3\u679C.pipe === "function") {
+      \u7ED3\u679C.pipe(res);
+    } else {
+      res.status(400).send("Invalid file data");
+    }
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   EXPORT_TYPE,
+  Express\u517C\u5BB9\u63A5\u53E3\u5C01\u88C5,
   GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
   JSON\u89E3\u6790\u63D2\u4EF6,
   WebSocket\u63D2\u4EF6,
@@ -750,6 +842,7 @@ var \u5E38\u7528\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5 = class extends
   \u63A5\u53E3\u903B\u8F91,
   \u63A5\u53E3\u903B\u8F91Base,
   \u63D2\u4EF6,
+  \u6587\u4EF6\u4E0B\u8F7D\u63A5\u53E3\u5C01\u88C5,
   \u666E\u901A\u5BF9\u8C61\u6DF1\u5408\u5E76,
   \u670D\u52A1\u5668,
   \u6784\u9020\u5143\u7EC4,

package/dist/cjs/index.d.cts

@@ -1,5 +1,5 @@
 export { 严格递归合并对象, 普通对象深合并, 构造元组, 构造对象 } from './help/help.cjs';
-export { 任 as 任意接口, x as 任意接口结果转换器, n as 任意接口逻辑, y as 任意插件, 兼 as 兼容空对象, A as 取插件内部ts类型, 取 as 取插件内部类型, 可 as 可调用接口逻辑, 合 as 合并插件结果, 常 as 常用形式转换器, b as 接口, a as 接口方法类型, w as 接口结果转换器, 接 as 接口路径类型, m as 接口逻辑, l as 接口逻辑Base, j as 接口逻辑正确类型, i as 接口逻辑错误类型, k as 接口逻辑附加参数类型, 插 as 插件, z as 插件项类型, 服 as 服务器, 清 as 清理函数类型, 直 as 直接形式转换器, 空 as 空对象, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, h as 获得接口结果返回器类型, 获 as 获得接口路径类型, s as 获得接口逻辑上游接口类型, o as 获得接口逻辑插件类型, t as 获得接口逻辑最后接口类型, r as 获得接口逻辑正确类型, d as 获得接口逻辑类型, q as 获得接口逻辑错误类型, p as 获得接口逻辑附加参数类型, e as 获得接口错误形式, 计 as 计算接口逻辑参数, v as 计算接口逻辑正确结果, u as 计算接口逻辑错误结果, 请 as 请求附加参数类型 } from './interface-base-CyfrfgWu.cjs';
+export { 任 as 任意接口, x as 任意接口结果转换器, n as 任意接口逻辑, y as 任意插件, 兼 as 兼容空对象, A as 取插件内部ts类型, 取 as 取插件内部类型, 可 as 可调用接口逻辑, 合 as 合并插件结果, 常 as 常用形式转换器, b as 接口, a as 接口方法类型, w as 接口结果转换器, 接 as 接口路径类型, m as 接口逻辑, l as 接口逻辑Base, j as 接口逻辑正确类型, i as 接口逻辑错误类型, k as 接口逻辑附加参数类型, 插 as 插件, z as 插件项类型, 日 as 日志回调类型, 服 as 服务器, 清 as 清理函数类型, 直 as 直接形式转换器, 空 as 空对象, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, h as 获得接口结果返回器类型, 获 as 获得接口路径类型, s as 获得接口逻辑上游接口类型, o as 获得接口逻辑插件类型, t as 获得接口逻辑最后接口类型, r as 获得接口逻辑正确类型, d as 获得接口逻辑类型, q as 获得接口逻辑错误类型, p as 获得接口逻辑附加参数类型, e as 获得接口错误形式, 计 as 计算接口逻辑参数, v as 计算接口逻辑正确结果, u as 计算接口逻辑错误结果, 请 as 请求附加参数类型 } from './interface-base-gRngpxki.cjs';
 export { 任意接口结果返回器, 常用返回器, 接口结果返回器, 自定义返回器 } from './interface/interface-retuen.cjs';
 export { 接口测试 } from './interface/interface-test.cjs';
 export { 自定义数据插件 } from './plugin/extend/custom-data.cjs';
@@ -13,9 +13,12 @@ export { GetNetCoreExportTypeDefine, GetNetCoreExportTypeName, NetCoreExportType
 export { 常用形式接口封装 } from './wrapper/common-wrapper.cjs';
 export { 常用形式并自定义返回器接口封装 } from './wrapper/common-wrapper-return.cjs';
 export { 常用直接形式接口封装 } from './wrapper/deferred-result-wrapper.cjs';
+export { Express兼容接口封装 } from './wrapper/express-compatible-wrapper.cjs';
+export { 文件下载接口封装, 文件数据类型 } from './wrapper/file-download-wrapper.cjs';
 import 'zod';
 import '@lsby/ts-fp-data';
 import 'express';
 import './help/interior.cjs';
 import '@lsby/ts-log';
 import 'node:http';
+import 'node:fs';

package/dist/cjs/interface/interface-base.d.cts

@@ -1,5 +1,5 @@
 import 'zod';
-export { 任 as 任意接口, b as 接口, a as 接口方法类型, 接 as 接口路径类型, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, h as 获得接口结果返回器类型, 获 as 获得接口路径类型, d as 获得接口逻辑类型, e as 获得接口错误形式 } from '../interface-base-CyfrfgWu.cjs';
+export { 任 as 任意接口, b as 接口, a as 接口方法类型, 接 as 接口路径类型, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, h as 获得接口结果返回器类型, 获 as 获得接口路径类型, d as 获得接口逻辑类型, e as 获得接口错误形式 } from '../interface-base-gRngpxki.cjs';
 import './interface-retuen.cjs';
 import '@lsby/ts-fp-data';
 import 'express';

package/dist/cjs/interface/interface-logic.d.cts

@@ -1,7 +1,7 @@
 import '@lsby/ts-fp-data';
 import 'express';
 import '../help/interior.cjs';
-export { n as 任意接口逻辑, 兼 as 兼容空对象, 可 as 可调用接口逻辑, m as 接口逻辑, l as 接口逻辑Base, j as 接口逻辑正确类型, i as 接口逻辑错误类型, k as 接口逻辑附加参数类型, 清 as 清理函数类型, 空 as 空对象, s as 获得接口逻辑上游接口类型, o as 获得接口逻辑插件类型, t as 获得接口逻辑最后接口类型, r as 获得接口逻辑正确类型, q as 获得接口逻辑错误类型, p as 获得接口逻辑附加参数类型, 计 as 计算接口逻辑参数, v as 计算接口逻辑正确结果, u as 计算接口逻辑错误结果 } from '../interface-base-CyfrfgWu.cjs';
+export { n as 任意接口逻辑, 兼 as 兼容空对象, 可 as 可调用接口逻辑, m as 接口逻辑, l as 接口逻辑Base, j as 接口逻辑正确类型, i as 接口逻辑错误类型, k as 接口逻辑附加参数类型, 清 as 清理函数类型, 空 as 空对象, s as 获得接口逻辑上游接口类型, o as 获得接口逻辑插件类型, t as 获得接口逻辑最后接口类型, r as 获得接口逻辑正确类型, q as 获得接口逻辑错误类型, p as 获得接口逻辑附加参数类型, 计 as 计算接口逻辑参数, v as 计算接口逻辑正确结果, u as 计算接口逻辑错误结果 } from '../interface-base-gRngpxki.cjs';
 import 'zod';
 import '@lsby/ts-log';
 import 'node:http';

package/dist/cjs/interface/interface-result.d.cts

@@ -1,5 +1,5 @@
 import '@lsby/ts-fp-data';
-export { x as 任意接口结果转换器, 常 as 常用形式转换器, w as 接口结果转换器, 直 as 直接形式转换器 } from '../interface-base-CyfrfgWu.cjs';
+export { x as 任意接口结果转换器, 常 as 常用形式转换器, w as 接口结果转换器, 直 as 直接形式转换器 } from '../interface-base-gRngpxki.cjs';
 import 'zod';
 import 'express';
 import '../help/interior.cjs';

package/dist/cjs/{interface-base-CyfrfgWu.d.cts → interface-base-gRngpxki.d.cts}

@@ -6,12 +6,14 @@ import { Log } from '@lsby/ts-log';
 import * as http from 'node:http';
 import { 接口结果返回器 as _______ } from './interface/interface-retuen.cjs';
 
+type 日志回调类型 = (level: 'trace' | 'debug' | 'info' | 'warn' | 'error', namespace: string, content: string) => Promise<void>;
 type 请求附加参数类型 = {
     log: Log;
+    请求id: string;
 };
 declare class 服务器 {
-    private 接口log;
-    private 系统log;
+    private log;
+    private 日志回调?;
     private 接口们;
     private 端口;
     private 静态资源路径;
@@ -21,8 +23,7 @@ declare class 服务器 {
         端口: number;
         静态资源路径?: string;
         默认get文件路径?: string;
-        系统log?: Log;
-        接口log?: Log;
+        日志回调?: 日志回调类型;
     });
     run(): Promise<{
         ip: string[];
@@ -231,4 +232,4 @@ type 获得接口正确形式<A> = A extends 接口<any, any, any, any, infer X,
 type 获得接口结果转换器类型<A> = A extends 接口<any, any, any, any, any, infer X, any> ? X : never;
 type 获得接口结果返回器类型<A> = A extends 接口<any, any, any, any, any, any, infer X> ? X : never;
 
-export { type 取插件内部ts类型 as A, type 接口方法类型 as a, 接口 as b, type 获得接口方法类型 as c, type 获得接口逻辑类型 as d, type 获得接口错误形式 as e, type 获得接口正确形式 as f, type 获得接口结果转换器类型 as g, type 获得接口结果返回器类型 as h, type 接口逻辑错误类型 as i, type 接口逻辑正确类型 as j, type 接口逻辑附加参数类型 as k, 接口逻辑Base as l, 接口逻辑 as m, type 任意接口逻辑 as n, type 获得接口逻辑插件类型 as o, type 获得接口逻辑附加参数类型 as p, type 获得接口逻辑错误类型 as q, type 获得接口逻辑正确类型 as r, type 获得接口逻辑上游接口类型 as s, type 获得接口逻辑最后接口类型 as t, type 计算接口逻辑错误结果 as u, type 计算接口逻辑正确结果 as v, 接口结果转换器 as w, type 任意接口结果转换器 as x, type 任意插件 as y, type 插件项类型 as z, type 任意接口 as 任, type 兼容空对象 as 兼, type 取插件内部类型 as 取, type 可调用接口逻辑 as 可, type 合并插件结果 as 合, 常用形式转换器 as 常, type 接口路径类型 as 接, 插件 as 插, 服务器 as 服, type 清理函数类型 as 清, 直接形式转换器 as 直, type 空对象 as 空, type 获得接口路径类型 as 获, type 计算接口逻辑参数 as 计, type 请求附加参数类型 as 请 };
+export { type 取插件内部ts类型 as A, type 接口方法类型 as a, 接口 as b, type 获得接口方法类型 as c, type 获得接口逻辑类型 as d, type 获得接口错误形式 as e, type 获得接口正确形式 as f, type 获得接口结果转换器类型 as g, type 获得接口结果返回器类型 as h, type 接口逻辑错误类型 as i, type 接口逻辑正确类型 as j, type 接口逻辑附加参数类型 as k, 接口逻辑Base as l, 接口逻辑 as m, type 任意接口逻辑 as n, type 获得接口逻辑插件类型 as o, type 获得接口逻辑附加参数类型 as p, type 获得接口逻辑错误类型 as q, type 获得接口逻辑正确类型 as r, type 获得接口逻辑上游接口类型 as s, type 获得接口逻辑最后接口类型 as t, type 计算接口逻辑错误结果 as u, type 计算接口逻辑正确结果 as v, 接口结果转换器 as w, type 任意接口结果转换器 as x, type 任意插件 as y, type 插件项类型 as z, type 任意接口 as 任, type 兼容空对象 as 兼, type 取插件内部类型 as 取, type 可调用接口逻辑 as 可, type 合并插件结果 as 合, 常用形式转换器 as 常, type 接口路径类型 as 接, 插件 as 插, type 日志回调类型 as 日, 服务器 as 服, type 清理函数类型 as 清, 直接形式转换器 as 直, type 空对象 as 空, type 获得接口路径类型 as 获, type 计算接口逻辑参数 as 计, type 请求附加参数类型 as 请 };

package/dist/cjs/plugin/extend/custom-data.d.cts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { 插 as __ } from '../../interface-base-CyfrfgWu.cjs';
+import { 插 as __ } from '../../interface-base-gRngpxki.cjs';
 import '@lsby/ts-fp-data';
 import 'express';
 import '../../help/interior.cjs';

package/dist/cjs/plugin/extend/json.d.cts

@@ -1,7 +1,7 @@
 import express from 'express';
 import { AnyZodObject, z } from 'zod';
 import { 严格递归合并对象 as ________ } from '../../help/help.cjs';
-import { 插 as __, z as _____, 取 as _______, o as __________ } from '../../interface-base-CyfrfgWu.cjs';
+import { 插 as __, z as _____, 取 as _______, o as __________ } from '../../interface-base-gRngpxki.cjs';
 import '@lsby/ts-fp-data';
 import '../../help/interior.cjs';
 import '@lsby/ts-log';

package/dist/cjs/plugin/extend/log-headers.d.cts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { 插 as __ } from '../../interface-base-CyfrfgWu.cjs';
+import { 插 as __ } from '../../interface-base-gRngpxki.cjs';
 import '@lsby/ts-fp-data';
 import 'express';
 import '../../help/interior.cjs';

package/dist/cjs/plugin/extend/query.d.cts

@@ -1,6 +1,6 @@
 import { AnyZodObject, z } from 'zod';
 import { 严格递归合并对象 as ________ } from '../../help/help.cjs';
-import { 插 as __, z as _____, 取 as _______, o as __________ } from '../../interface-base-CyfrfgWu.cjs';
+import { 插 as __, z as _____, 取 as _______, o as __________ } from '../../interface-base-gRngpxki.cjs';
 import '@lsby/ts-fp-data';
 import 'express';
 import '../../help/interior.cjs';

package/dist/cjs/plugin/extend/urlencoded.d.cts

@@ -1,6 +1,6 @@
 import express from 'express';
 import { z } from 'zod';
-import { 插 as __ } from '../../interface-base-CyfrfgWu.cjs';
+import { 插 as __ } from '../../interface-base-gRngpxki.cjs';
 import '@lsby/ts-fp-data';
 import '../../help/interior.cjs';
 import '@lsby/ts-log';

package/dist/cjs/plugin/extend/web-socket.d.cts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { 插 as __, z as _____ } from '../../interface-base-CyfrfgWu.cjs';
+import { 插 as __, z as _____ } from '../../interface-base-gRngpxki.cjs';
 import '@lsby/ts-fp-data';
 import 'express';
 import '../../help/interior.cjs';

package/dist/cjs/plugin/plug.d.cts

@@ -1,6 +1,6 @@
 import 'express';
 import 'zod';
-export { y as 任意插件, A as 取插件内部ts类型, 取 as 取插件内部类型, 合 as 合并插件结果, 插 as 插件, z as 插件项类型 } from '../interface-base-CyfrfgWu.cjs';
+export { y as 任意插件, A as 取插件内部ts类型, 取 as 取插件内部类型, 合 as 合并插件结果, 插 as 插件, z as 插件项类型 } from '../interface-base-gRngpxki.cjs';
 import '@lsby/ts-fp-data';
 import '../help/interior.cjs';
 import '@lsby/ts-log';