@lsby/net-core 0.7.0 → 0.7.1

package/dist/cjs/index.cjs

@@ -40,7 +40,6 @@ __export(src_exports, {
   \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668: () => \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668,
   \u5E38\u7528\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5: () => \u5E38\u7528\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5,
   \u5E38\u7528\u5F62\u5F0F\u8F6C\u6362\u5668: () => \u5E38\u7528\u5F62\u5F0F\u8F6C\u6362\u5668,
-  \u622A\u65AD\u5B57\u7B26\u4E32: () => \u622A\u65AD\u5B57\u7B26\u4E32,
   \u63A5\u53E3: () => \u63A5\u53E3,
   \u63A5\u53E3\u6D4B\u8BD5: () => \u63A5\u53E3\u6D4B\u8BD5,
   \u63A5\u53E3\u7ED3\u679C\u8F6C\u6362\u5668: () => \u63A5\u53E3\u7ED3\u679C\u8F6C\u6362\u5668,
@@ -52,8 +51,7 @@ __export(src_exports, {
   \u6784\u9020\u5BF9\u8C61: () => \u6784\u9020\u5BF9\u8C61,
   \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6: () => \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6,
   \u8868\u5355\u89E3\u6790\u63D2\u4EF6: () => \u8868\u5355\u89E3\u6790\u63D2\u4EF6,
-  \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6: () => \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6,
-  \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32: () => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32
+  \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6: () => \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -64,27 +62,6 @@ function \u6784\u9020\u5143\u7EC4(args) {
 function \u6784\u9020\u5BF9\u8C61(key, value) {
   return { [key]: value };
 }
-function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
-  let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
-  if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
-    return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
-  return \u5185\u5BB9;
-}
-function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
-  if (typeof \u6570\u636E === "string")
-    return \u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E);
-  if (Array.isArray(\u6570\u636E))
-    return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
-  if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
-    let \u65B0\u6570\u636E = {};
-    for (let key in \u6570\u636E) {
-      if (\u6570\u636E.hasOwnProperty(key) === true)
-        \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
-    }
-    return \u65B0\u6570\u636E;
-  }
-  return \u6570\u636E;
-}
 
 // src/interface/interface-base.ts
 var \u63A5\u53E3 = class {
@@ -149,7 +126,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
       let \u63D2\u4EF6\u8FD4\u56DE = await \u63D2\u4EF6\u672C\u4F53.\u8FD0\u884C(req, res, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570);
       \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.push(\u63D2\u4EF6\u8FD4\u56DE);
     }
-    let \u5408\u5E76\u63D2\u4EF6\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => Object.assign(s, a), {});
+    let \u5408\u5E76\u63D2\u4EF6\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => ({ ...s, ...a }), {});
     await log.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
     await log.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
     let \u5B9E\u73B0\u7ED3\u679C = await this.\u5B9E\u73B0(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570);
@@ -270,162 +247,40 @@ var import_ts_log = require("@lsby/ts-log");
 
 // src/global/web-socket-management.ts
 var WebSocket\u7BA1\u7406\u5668 = class {
-  log = Global.getItem("log").then((a) => a.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668"));
-  \u8FDE\u63A5\u8868 = {};
-  async \u5173\u95ED\u5E76\u5220\u9664\u8FDE\u63A5(id, code, \u8BF4\u660E) {
-    let log = (await this.log).extend(id).extend("\u5173\u95ED\u5E76\u5220\u9664\u8FDE\u63A5");
-    try {
-      await this.\u8FDE\u63A5\u8868[id]?.\u6E05\u7406\u51FD\u6570?.();
-    } catch (err) {
-      await log.error(`\u6267\u884C\u6E05\u7406\u51FD\u6570\u5931\u8D25: %o.`, String(err));
-    }
-    this.\u8FDE\u63A5\u8868[id]?.ws?.close(code, \u8BF4\u660E);
-    delete this.\u8FDE\u63A5\u8868[id];
+  constructor(\u8FDE\u63A5\u8868) {
+    this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
   }
-  async \u9500\u6BC1\u5224\u5B9A(id) {
-    let log = (await this.log).extend(id).extend("\u9500\u6BC1\u5224\u5B9A");
-    let \u8FDE\u63A5 = this.\u8FDE\u63A5\u8868[id];
-    if (\u8FDE\u63A5 === void 0) {
-      await log.error(`\u65E0\u6CD5\u627E\u5230\u8FDE\u63A5`);
-      return;
-    }
-    if (\u8FDE\u63A5.\u5DF2\u9519\u8BEF === true) {
-      await log.error(`\u8FDE\u63A5\u5DF2\u88AB\u6807\u8BB0\u4E3A\u9519\u8BEF, \u65AD\u5F00\u8FDE\u63A5.`);
-      clearTimeout(\u8FDE\u63A5.\u8D85\u65F6\u5B9A\u65F6\u5668);
-      await this.\u5173\u95ED\u5E76\u5220\u9664\u8FDE\u63A5(id, 1011, "\u53D1\u751F\u9519\u8BEF");
-      return;
-    }
-    if (\u8FDE\u63A5.\u5DF2\u5B8C\u6210 === true && \u8FDE\u63A5.\u7F13\u5B58.length === 0) {
-      await log.debug(`\u8FDE\u63A5\u5DF2\u5B8C\u6210, \u6B63\u5E38\u5173\u95ED.`);
-      await this.\u5173\u95ED\u5E76\u5220\u9664\u8FDE\u63A5(id, 1e3, "\u6B63\u5E38\u5173\u95ED");
-      return;
-    }
-    if (\u8FDE\u63A5.\u5DF2\u65AD\u5F00 === false) {
-      clearTimeout(\u8FDE\u63A5.\u8D85\u65F6\u5B9A\u65F6\u5668);
-    }
-    if (\u8FDE\u63A5.\u5DF2\u65AD\u5F00 === true) {
-      await log.debug("\u8FDE\u63A5\u5DF2\u65AD\u5F00, \u7B49\u5F85\u5BA2\u6237\u7AEF\u91CD\u8FDE.");
-      let \u8D85\u65F6\u65F6\u95F4 = 3e4;
-      clearTimeout(\u8FDE\u63A5.\u8D85\u65F6\u5B9A\u65F6\u5668);
-      \u8FDE\u63A5.\u8D85\u65F6\u5B9A\u65F6\u5668 = setTimeout(async () => {
-        if (this.\u8FDE\u63A5\u8868[id]?.\u5DF2\u65AD\u5F00 === true) {
-          await log.error("\u5BA2\u6237\u7AEF\u8D85\u65F6\u672A\u91CD\u8FDE\uFF0C\u6E05\u7406\u8FDE\u63A5.");
-          await this.\u5173\u95ED\u5E76\u5220\u9664\u8FDE\u63A5(id, 1011, "\u5BA2\u6237\u7AEF\u8D85\u65F6\u672A\u91CD\u8FDE\uFF0C\u6E05\u7406\u8FDE\u63A5");
-        }
-      }, \u8D85\u65F6\u65F6\u95F4);
-    }
+  log = Global.getItem("log").then((a) => a.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668"));
+  \u6E05\u7406\u51FD\u6570\u8868 = {};
+  async \u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
+    this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
   }
-  async \u589E\u52A0\u6216\u66FF\u6362\u8FDE\u63A5(id, ws) {
-    let log = (await this.log).extend(id).extend("\u589E\u52A0\u6216\u66FF\u6362\u8FDE\u63A5");
-    if (this.\u8FDE\u63A5\u8868[id] === void 0) {
-      this.\u8FDE\u63A5\u8868[id] = {
-        ws,
-        \u7F13\u5B58: [],
-        \u5DF2\u5B8C\u6210: false,
-        \u5DF2\u65AD\u5F00: false,
-        \u5DF2\u9519\u8BEF: false,
-        \u6570\u636E\u53D1\u9001\u4E2D: false,
-        \u7F13\u5B58\u53D1\u9001\u4E2D: false
-      };
-      return;
-    }
-    let \u65E7\u53E5\u67C4 = this.\u8FDE\u63A5\u8868[id].ws;
-    await log.info("\u65E7\u8FDE\u63A5\u5B58\u5728, \u5C06\u66FF\u6362\u8868\u4E2D\u6570\u636E, \u5E76\u5173\u95ED\u65E7ws\u53E5\u67C4.");
-    this.\u8FDE\u63A5\u8868[id].ws = ws;
-    this.\u8FDE\u63A5\u8868[id].\u5DF2\u5B8C\u6210 = false;
-    this.\u8FDE\u63A5\u8868[id].\u5DF2\u65AD\u5F00 = false;
-    this.\u8FDE\u63A5\u8868[id].\u5DF2\u9519\u8BEF = false;
-    this.\u8FDE\u63A5\u8868[id].\u6570\u636E\u53D1\u9001\u4E2D = false;
-    this.\u8FDE\u63A5\u8868[id].\u7F13\u5B58\u53D1\u9001\u4E2D = false;
-    \u65E7\u53E5\u67C4?.close(1011, "\u65B0\u8FDE\u63A5\u66FF\u6362\u65E7\u8FDE\u63A5");
-    await log.info("\u53D1\u9001\u65E7\u8FDE\u63A5\u7F13\u5B58");
-    this.\u8FDE\u63A5\u8868[id].\u7F13\u5B58\u53D1\u9001\u4E2D = true;
-    while (this.\u8FDE\u63A5\u8868[id].\u7F13\u5B58.length !== 0) {
-      await this.\u53D1\u9001\u4FE1\u606F_\u5185\u90E8(id, this.\u8FDE\u63A5\u8868[id].\u7F13\u5B58.shift());
-    }
-    this.\u8FDE\u63A5\u8868[id].\u7F13\u5B58\u53D1\u9001\u4E2D = false;
-    await log.info("\u53D1\u9001\u65E7\u8FDE\u63A5\u7F13\u5B58\u5B8C\u6210");
+  async \u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(id) {
+    return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
   }
   async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
-    let log = (await this.log).extend(id).extend("\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570");
-    if (this.\u8FDE\u63A5\u8868[id] === void 0) {
-      await log.error(`\u65E0\u6CD5\u627E\u5230\u8FDE\u63A5`);
-      return;
-    }
-    this.\u8FDE\u63A5\u8868[id].\u6E05\u7406\u51FD\u6570 = \u6E05\u7406\u51FD\u6570;
-  }
-  async \u53D1\u9001\u4FE1\u606F_\u5185\u90E8(id, data) {
-    let log = (await this.log).extend(id).extend("\u53D1\u9001\u4FE1\u606F(\u5185\u90E8)");
-    while (this.\u8FDE\u63A5\u8868[id]?.\u6570\u636E\u53D1\u9001\u4E2D === true) {
-      await log.info("\u6570\u636E\u53D1\u9001\u4E2D, \u5C06\u9000\u907F.");
-      let \u9000\u907F\u65F6\u95F4 = 100;
-      await new Promise((res, _rej) => setTimeout(() => res(), \u9000\u907F\u65F6\u95F4));
-    }
-    let \u8FDE\u63A5 = this.\u8FDE\u63A5\u8868[id];
-    if (\u8FDE\u63A5 === void 0) {
-      await log.error("\u65E0\u6CD5\u627E\u5230\u8FDE\u63A5");
+    if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
       return;
-    }
-    await new Promise((res, rej) => {
-      \u8FDE\u63A5.\u6570\u636E\u53D1\u9001\u4E2D = true;
-      let ws\u53E5\u67C4 = \u8FDE\u63A5.ws;
-      if (ws\u53E5\u67C4 === null) {
-        log.error("\u65E0\u6CD5\u627E\u5230ws\u53E5\u67C4").catch(console.error);
-        return;
-      }
-      ws\u53E5\u67C4.send(JSON.stringify(data), (err) => {
-        if ((err ?? null) !== null) {
-          log.error(err).catch(console.error);
-          return rej(err);
-        }
-        log.debug("WebSocket \u4FE1\u606F\u53D1\u9001\u6210\u529F").catch(console.error);
-        return res();
-      });
-    }).finally(() => {
-      \u8FDE\u63A5.\u6570\u636E\u53D1\u9001\u4E2D = false;
-    });
+    this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
   }
-  async \u53D1\u9001\u4FE1\u606F(id, data) {
-    let log = (await this.log).extend(id).extend("\u53D1\u9001\u4FE1\u606F");
-    if (this.\u8FDE\u63A5\u8868[id]?.\u5DF2\u5B8C\u6210 === true) {
-      await log.error("\u8FDE\u63A5\u5DF2\u5B8C\u6210, \u65E0\u6CD5\u53D1\u9001\u6570\u636E.");
-      return;
-    }
-    if (this.\u8FDE\u63A5\u8868[id]?.\u5DF2\u65AD\u5F00 === true) {
-      await log.error("\u8FDE\u63A5\u5DF2\u65AD\u5F00, \u5C06\u7F13\u5B58\u6570\u636E.");
-      this.\u8FDE\u63A5\u8868[id].\u7F13\u5B58.push(data);
-      return;
+  async \u83B7\u5F97\u53E5\u67C4(id) {
+    return this.\u8FDE\u63A5\u8868[id] ?? null;
+  }
+  async \u5220\u9664\u8FDE\u63A5(id) {
+    let log = await this.log;
+    let \u6E05\u7406\u51FD\u6570 = this.\u6E05\u7406\u51FD\u6570\u8868[id];
+    try {
+      this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
+    } catch (err) {
+      await log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
     }
-    while (this.\u8FDE\u63A5\u8868[id]?.\u7F13\u5B58\u53D1\u9001\u4E2D === true) {
-      await log.info("\u7F13\u5B58\u53D1\u9001\u4E2D, \u5C06\u9000\u907F.");
-      let \u9000\u907F\u65F6\u95F4 = 100;
-      await new Promise((res, _rej) => setTimeout(() => res(), \u9000\u907F\u65F6\u95F4));
+    try {
+      await \u6E05\u7406\u51FD\u6570?.();
+    } catch (err) {
+      await log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
     }
-    await this.\u53D1\u9001\u4FE1\u606F_\u5185\u90E8(id, data);
-  }
-  async \u6807\u8BB0\u8FDE\u63A5\u5DF2\u5B8C\u6210(id) {
-    if (this.\u8FDE\u63A5\u8868[id] === void 0)
-      return;
-    this.\u8FDE\u63A5\u8868[id].\u5DF2\u5B8C\u6210 = true;
-    await this.\u9500\u6BC1\u5224\u5B9A(id);
-  }
-  async \u6807\u8BB0\u8FDE\u63A5\u5DF2\u65AD\u5F00(id) {
-    if (this.\u8FDE\u63A5\u8868[id] === void 0)
-      return;
-    this.\u8FDE\u63A5\u8868[id].\u5DF2\u65AD\u5F00 = true;
-    await this.\u9500\u6BC1\u5224\u5B9A(id);
-  }
-  async \u53D6\u6D88\u6807\u8BB0\u8FDE\u63A5\u5DF2\u65AD\u5F00(id) {
-    if (this.\u8FDE\u63A5\u8868[id] === void 0)
-      return;
-    this.\u8FDE\u63A5\u8868[id].\u5DF2\u65AD\u5F00 = false;
-    await this.\u9500\u6BC1\u5224\u5B9A(id);
-  }
-  async \u6807\u8BB0\u8FDE\u63A5\u5DF2\u9519\u8BEF(id) {
-    if (this.\u8FDE\u63A5\u8868[id] === void 0)
-      return;
-    this.\u8FDE\u63A5\u8868[id].\u5DF2\u9519\u8BEF = true;
-    await this.\u9500\u6BC1\u5224\u5B9A(id);
+    delete this.\u8FDE\u63A5\u8868[id];
+    delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
   }
 };
 
@@ -435,7 +290,7 @@ var Global = new import_ts_global.GlobalService([
     return new import_ts_log.Log("@lsby:net-core");
   }),
   new import_ts_global.GlobalAsyncItem("WebSocket\u7BA1\u7406\u5668", async () => {
-    return new WebSocket\u7BA1\u7406\u5668();
+    return new WebSocket\u7BA1\u7406\u5668({});
   })
 ]);
 
@@ -454,6 +309,31 @@ var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
 // src/plugin/extend/json.ts
 var import_express = __toESM(require("express"), 1);
 var import_node_util = require("util");
+
+// src/help/interior.ts
+function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
+  let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
+  if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
+    return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
+  return \u5185\u5BB9;
+}
+function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
+  if (typeof \u6570\u636E === "string")
+    return \u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E);
+  if (Array.isArray(\u6570\u636E))
+    return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
+  if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
+    let \u65B0\u6570\u636E = {};
+    for (let key in \u6570\u636E) {
+      if (\u6570\u636E.hasOwnProperty(key) === true)
+        \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
+    }
+    return \u65B0\u6570\u636E;
+  }
+  return \u6570\u636E;
+}
+
+// src/plugin/extend/json.ts
 var \u70D9\u5370 = Symbol();
 var JSON\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
   [\u70D9\u5370] = ["JSON\u89E3\u6790\u63D2\u4EF6"];
@@ -564,6 +444,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
       async (req, _res, \u9644\u52A0\u53C2\u6570) => {
         let log = \u9644\u52A0\u53C2\u6570.log.extend("webSocket\u63D2\u4EF6");
         let WebSocket\u7BA1\u7406\u56682 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
+        let ws\u53E5\u67C4 = null;
         let wsId = req.headers["ws-client-id"];
         await log.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
         if (typeof wsId !== "string") {
@@ -572,15 +453,32 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
         }
         let \u5B58\u5728\u7684wsId = wsId;
         await log.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
+        await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
+        ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(\u5B58\u5728\u7684wsId);
+        if (ws\u53E5\u67C4 === null) {
+          await log.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
+          return { ws\u64CD\u4F5C: null };
+        }
+        let \u5B58\u5728\u7684ws\u53E5\u67C4 = ws\u53E5\u67C4;
+        await log.debug("WebSocket \u53E5\u67C4\u5DF2\u51C6\u5907\u597D");
         return {
           ws\u64CD\u4F5C: {
             async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
               await log.debug("\u53D1\u9001 WebSocket \u4FE1\u606F: %O", \u4FE1\u606F);
-              await WebSocket\u7BA1\u7406\u56682.\u53D1\u9001\u4FE1\u606F(\u5B58\u5728\u7684wsId, \u4FE1\u606F);
+              return new Promise((res, rej) => {
+                \u5B58\u5728\u7684ws\u53E5\u67C4.send(JSON.stringify(\u4FE1\u606F), (err) => {
+                  if ((err ?? null) !== null) {
+                    log.error("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25: %O", err).catch(console.error);
+                    return rej(err);
+                  }
+                  log.debug("WebSocket \u4FE1\u606F\u53D1\u9001\u6210\u529F").catch(console.error);
+                  return res();
+                });
+              });
             },
             async \u5173\u95EDws\u8FDE\u63A5() {
               await log.debug("\u5173\u95ED WebSocket \u8FDE\u63A5");
-              await WebSocket\u7BA1\u7406\u56682.\u6807\u8BB0\u8FDE\u63A5\u5DF2\u5B8C\u6210(\u5B58\u5728\u7684wsId);
+              await WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5B58\u5728\u7684wsId);
             },
             async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u6E05\u7406\u51FD\u6570) {
               await WebSocket\u7BA1\u7406\u56682.\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u5B58\u5728\u7684wsId, \u6E05\u7406\u51FD\u6570);
@@ -697,30 +595,34 @@ var \u670D\u52A1\u5668 = class {
       await log.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 log.error("\u7F3A\u5C11\u5BA2\u6237\u7AEFid");
-        return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 1011, "\u7F3A\u5C11\u5BA2\u6237\u7AEFid");
+        await log.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
+        return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
       }
+      await log.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
       let WebSocket\u7BA1\u7406\u56682 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
-      log = log.extend(\u5BA2\u6237\u7AEFid);
-      await log.debug("\u6210\u529F\u89E3\u6790\u5BA2\u6237\u7AEFid");
-      await WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u6216\u66FF\u6362\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
-      await log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB");
-      await WebSocket\u7BA1\u7406\u56682.\u53D6\u6D88\u6807\u8BB0\u8FDE\u63A5\u5DF2\u65AD\u5F00(\u5BA2\u6237\u7AEFid);
+      let \u8FDE\u63A5\u5DF2\u5B58\u5728 = await WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
+      if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
+        await log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
+        return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
+      }
+      await WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
+      await log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
       ws.on("close", async () => {
-        await WebSocket\u7BA1\u7406\u56682.\u6807\u8BB0\u8FDE\u63A5\u5DF2\u65AD\u5F00(\u5BA2\u6237\u7AEFid);
+        await log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
+        await WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
       });
       ws.on("error", async (err) => {
-        await log.error("WebSocket \u51FA\u73B0\u9519\u8BEF: %o", String(err));
-        await WebSocket\u7BA1\u7406\u56682.\u6807\u8BB0\u8FDE\u63A5\u5DF2\u9519\u8BEF(\u5BA2\u6237\u7AEFid);
+        await log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
+        await WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
+      });
+      wss.on("listening", async () => {
+        let log2 = logBase;
+        await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
+      });
+      wss.on("error", async (err) => {
+        let log2 = logBase;
+        await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
       });
-    });
-    wss.on("listening", async () => {
-      let log = logBase;
-      await log.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
-    });
-    wss.on("error", async (err) => {
-      let log = logBase;
-      await log.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
     });
   }
   async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, code, reason) {
@@ -768,7 +670,6 @@ var \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5 = c
   \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668,
   \u5E38\u7528\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5,
   \u5E38\u7528\u5F62\u5F0F\u8F6C\u6362\u5668,
-  \u622A\u65AD\u5B57\u7B26\u4E32,
   \u63A5\u53E3,
   \u63A5\u53E3\u6D4B\u8BD5,
   \u63A5\u53E3\u7ED3\u679C\u8F6C\u6362\u5668,
@@ -780,6 +681,5 @@ var \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5 = c
   \u6784\u9020\u5BF9\u8C61,
   \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6,
   \u8868\u5355\u89E3\u6790\u63D2\u4EF6,
-  \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6,
-  \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32
+  \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6
 });

package/dist/cjs/index.d.cts

@@ -1,5 +1,5 @@
-export { 去除只读, 对象去重, 截断字符串, 数组包含, 数组去重, 构造元组, 构造对象, 类型相等, 联合转元组, 递归截断字符串 } from './help/help.cjs';
-export { 任 as 任意接口, v as 任意接口结果转换器, m as 任意接口逻辑, x as 任意插件, 兼 as 兼容空对象, 包 as 包装插件项, 取 as 取Task插件内部类型, z as 取Task插件类型, A as 取插件内部ts类型, 可 as 可调用接口逻辑, 合 as 合并插件结果, w as 常用延时直接形式转换器, 常 as 常用形式转换器, b as 接口, a as 接口方法类型, u as 接口结果转换器, 接 as 接口路径类型, l as 接口逻辑, k as 接口逻辑Base, i as 接口逻辑正确类型, h as 接口逻辑错误类型, j as 接口逻辑附加参数类型, 插 as 插件, y as 插件项类型, 服 as 服务器, 空 as 空对象, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, 获 as 获得接口路径类型, n as 获得接口逻辑插件类型, r as 获得接口逻辑最后接口类型, q as 获得接口逻辑正确类型, d as 获得接口逻辑类型, p as 获得接口逻辑错误类型, o as 获得接口逻辑附加参数类型, e as 获得接口错误形式, 计 as 计算接口逻辑参数, t as 计算接口逻辑正确结果, s as 计算接口逻辑错误结果, 请 as 请求附加参数类型 } from './interface-base-CNHVr8eR.cjs';
+export { 构造元组, 构造对象 } from './help/help.cjs';
+export { 任 as 任意接口, v as 任意接口结果转换器, m as 任意接口逻辑, x as 任意插件, 兼 as 兼容空对象, 包 as 包装插件项, 取 as 取Task插件内部类型, z as 取Task插件类型, A as 取插件内部ts类型, 可 as 可调用接口逻辑, 合 as 合并插件结果, w as 常用延时直接形式转换器, 常 as 常用形式转换器, b as 接口, a as 接口方法类型, u as 接口结果转换器, 接 as 接口路径类型, l as 接口逻辑, k as 接口逻辑Base, i as 接口逻辑正确类型, h as 接口逻辑错误类型, j as 接口逻辑附加参数类型, 插 as 插件, y as 插件项类型, 服 as 服务器, 空 as 空对象, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, 获 as 获得接口路径类型, n as 获得接口逻辑插件类型, r as 获得接口逻辑最后接口类型, q as 获得接口逻辑正确类型, d as 获得接口逻辑类型, p as 获得接口逻辑错误类型, o as 获得接口逻辑附加参数类型, e as 获得接口错误形式, 计 as 计算接口逻辑参数, t as 计算接口逻辑正确结果, s as 计算接口逻辑错误结果, 请 as 请求附加参数类型 } from './interface-base-CBN3QoUN.cjs';
 export { 接口测试 } from './interface/interface-test.cjs';
 export { 中文路径支持插件 } from './plugin/extend/chinese-path.cjs';
 export { 自定义数据插件 } from './plugin/extend/custom-data.cjs';
@@ -16,5 +16,6 @@ export { 常用延时直接形式接口封装 } from './wrapper/deferred-result-
 import 'zod';
 import '@lsby/ts-fp-data';
 import 'express';
+import './help/interior.cjs';
 import '@lsby/ts-log';
 import 'node:http';

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

@@ -1,7 +1,7 @@
 import 'zod';
-export { 任 as 任意接口, b as 接口, a as 接口方法类型, 接 as 接口路径类型, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, 获 as 获得接口路径类型, d as 获得接口逻辑类型, e as 获得接口错误形式 } from '../interface-base-CNHVr8eR.cjs';
+export { 任 as 任意接口, b as 接口, a as 接口方法类型, 接 as 接口路径类型, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, 获 as 获得接口路径类型, d as 获得接口逻辑类型, e as 获得接口错误形式 } from '../interface-base-CBN3QoUN.cjs';
 import '@lsby/ts-fp-data';
 import 'express';
-import '../help/help.cjs';
+import '../help/interior.cjs';
 import '@lsby/ts-log';
 import 'node:http';

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

@@ -56,7 +56,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
       let \u63D2\u4EF6\u8FD4\u56DE = await \u63D2\u4EF6\u672C\u4F53.\u8FD0\u884C(req, res, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570);
       \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.push(\u63D2\u4EF6\u8FD4\u56DE);
     }
-    let \u5408\u5E76\u63D2\u4EF6\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => Object.assign(s, a), {});
+    let \u5408\u5E76\u63D2\u4EF6\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => ({ ...s, ...a }), {});
     await log.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
     await log.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
     let \u5B9E\u73B0\u7ED3\u679C = await this.\u5B9E\u73B0(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570);

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

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

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

@@ -1,7 +1,7 @@
 import '@lsby/ts-fp-data';
-export { v as 任意接口结果转换器, w as 常用延时直接形式转换器, 常 as 常用形式转换器, u as 接口结果转换器 } from '../interface-base-CNHVr8eR.cjs';
+export { v as 任意接口结果转换器, w as 常用延时直接形式转换器, 常 as 常用形式转换器, u as 接口结果转换器 } from '../interface-base-CBN3QoUN.cjs';
 import 'zod';
 import 'express';
-import '../help/help.cjs';
+import '../help/interior.cjs';
 import '@lsby/ts-log';
 import 'node:http';

package/dist/{esm/interface-base-52hTGKAQ.d.ts → cjs/interface-base-CBN3QoUN.d.cts}

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { Task, Either } from '@lsby/ts-fp-data';
 import { Request, Response } from 'express';
-import { 联合转元组 as _____ } from './help/help.js';
+import { 联合转元组 as _____ } from './help/interior.cjs';
 import { Log } from '@lsby/ts-log';
 import * as http from 'node:http';
 

package/dist/cjs/plugin/extend/chinese-path.d.cts

@@ -1,8 +1,8 @@
 import { z } from 'zod';
-import { 插 as __ } from '../../interface-base-CNHVr8eR.cjs';
+import { 插 as __ } from '../../interface-base-CBN3QoUN.cjs';
 import '@lsby/ts-fp-data';
 import 'express';
-import '../../help/help.cjs';
+import '../../help/interior.cjs';
 import '@lsby/ts-log';
 import 'node:http';