@lsby/net-core 0.12.3 → 0.13.4

package/dist/cjs/server/server.cjs

@@ -34,107 +34,149 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 var import_express = __toESM(require("express"), 1);
-var import_promises = require("fs/promises");
 var import_node_os = require("os");
 var import_short_uuid = __toESM(require("short-uuid"), 1);
-var import_ws2 = require("ws");
+var import_ws = require("ws");
 
-// src/global/global.ts
-var import_ts_global = require("@lsby/ts-global");
+// src/global/log.ts
 var import_ts_log = require("@lsby/ts-log");
-var import_ws = require("ws");
-var log = new import_ts_log.Log("@lsby:net-core");
-var WebSocket\u7BA1\u7406\u5668 = class {
-  constructor(\u8FDE\u63A5\u8868) {
-    this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
-    this.\u5B9A\u65F6\u5668ID = setInterval(
-      () => {
-        this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
-          this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`).catch((a) => `\u65E5\u5FD7\u8F93\u51FA\u9519\u8BEF: ${a}: \u65E5\u5FD7\u5185\u5BB9: ${`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`}`);
-        });
-      },
-      5 * 60 * 1e3
-    );
+var \u5168\u5C40\u65E5\u5FD7\u5355\u4F8B = new import_ts_log.Log("@lsby:net-core");
+
+// src/global/model/hub.ts
+var \u96C6\u7EBF\u5668\u76D1\u542C\u5668\u6301\u6709\u8005 = class {
+  constructor(\u76D1\u542C\u5668) {
+    this.\u76D1\u542C\u5668 = \u76D1\u542C\u5668;
   }
-  log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
-  \u6E05\u7406\u51FD\u6570\u8868 = {};
-  \u6D88\u606F\u76D1\u542C\u8868 = {};
-  \u5B9A\u65F6\u5668ID = null;
-  \u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
-    this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
+};
+var \u96C6\u7EBF\u5668\u6A21\u578B = class _\u96C6\u7EBF\u5668\u6A21\u578B {
+  // 使用 WeakRef + FinalizationRegistry 防止"反向持有" this
+  static \u6E05\u7406\u6CE8\u518C\u5668 = new FinalizationRegistry(({ \u5B9E\u4F8B\u5F15\u7528, \u76D1\u542C\u5668 }) => {
+    let \u5B9E\u4F8B = \u5B9E\u4F8B\u5F15\u7528.deref();
+    if (\u5B9E\u4F8B === void 0) return;
+    let \u7D22\u5F15 = \u5B9E\u4F8B.\u76D1\u542C\u5668\u5217\u8868.indexOf(\u76D1\u542C\u5668);
+    if (\u7D22\u5F15 !== -1) \u5B9E\u4F8B.\u76D1\u542C\u5668\u5217\u8868.splice(\u7D22\u5F15, 1);
+  });
+  \u76D1\u542C\u5668\u5217\u8868 = [];
+  \u6301\u6709\u8005\u6620\u5C04 = /* @__PURE__ */ new WeakMap();
+  \u9519\u8BEF\u5904\u7406\u5668 = null;
+  /**
+   * 设置广播错误时的处理器。
+   */
+  \u8BBE\u7F6E\u9519\u8BEF\u5904\u7406\u5668(\u5904\u7406\u5668) {
+    this.\u9519\u8BEF\u5904\u7406\u5668 = \u5904\u7406\u5668;
   }
-  \u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(id) {
-    return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
+  /**
+   * 注册监听器。
+   * 若外部不再持有返回的 `监听器持有者`，监听器会在未来某个时间自动移除。
+   * ⚠️ 自动清理是非确定性的，不能依赖它实现实时释放。
+   */
+  \u6DFB\u52A0\u76D1\u542C\u5668(\u76D1\u542C\u5668) {
+    this.\u76D1\u542C\u5668\u5217\u8868.push(\u76D1\u542C\u5668);
+    let \u6301\u6709\u8005 = new \u96C6\u7EBF\u5668\u76D1\u542C\u5668\u6301\u6709\u8005(\u76D1\u542C\u5668);
+    this.\u6301\u6709\u8005\u6620\u5C04.set(\u6301\u6709\u8005, \u76D1\u542C\u5668);
+    let \u5B9E\u4F8B\u5F31\u5F15\u7528 = new WeakRef(this);
+    _\u96C6\u7EBF\u5668\u6A21\u578B.\u6E05\u7406\u6CE8\u518C\u5668.register(\u6301\u6709\u8005, { \u5B9E\u4F8B\u5F15\u7528: \u5B9E\u4F8B\u5F31\u5F15\u7528, \u76D1\u542C\u5668 }, \u6301\u6709\u8005);
+    return \u6301\u6709\u8005;
   }
-  async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
-    if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
-    this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
+  \u79FB\u9664\u76D1\u542C\u5668(\u6301\u6709\u8005) {
+    let \u76D1\u542C\u5668 = this.\u6301\u6709\u8005\u6620\u5C04.get(\u6301\u6709\u8005);
+    if (\u76D1\u542C\u5668 === void 0) return;
+    let \u7D22\u5F15 = this.\u76D1\u542C\u5668\u5217\u8868.indexOf(\u76D1\u542C\u5668);
+    if (\u7D22\u5F15 !== -1) this.\u76D1\u542C\u5668\u5217\u8868.splice(\u7D22\u5F15, 1);
+    _\u96C6\u7EBF\u5668\u6A21\u578B.\u6E05\u7406\u6CE8\u518C\u5668.unregister(\u6301\u6709\u8005);
+    this.\u6301\u6709\u8005\u6620\u5C04.delete(\u6301\u6709\u8005);
   }
-  async \u8BBE\u7F6E\u6D88\u606F\u76D1\u542C(id, \u56DE\u8C03\u51FD\u6570) {
-    if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
-    this.\u6D88\u606F\u76D1\u542C\u8868[id] = \u56DE\u8C03\u51FD\u6570;
-    let ws\u53E5\u67C4 = this.\u8FDE\u63A5\u8868[id];
-    if (ws\u53E5\u67C4 !== null && ws\u53E5\u67C4 !== void 0) {
-      ws\u53E5\u67C4.onmessage = async (event) => {
-        try {
-          await \u56DE\u8C03\u51FD\u6570(JSON.parse(event.data.toString()));
-        } catch (err) {
-          await this.log.warn(`WebSocket \u6D88\u606F\u5904\u7406\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
-        }
-      };
+  async \u5E7F\u64AD(\u6570\u636E) {
+    let snapshot = [...this.\u76D1\u542C\u5668\u5217\u8868];
+    let \u7ED3\u679C = await Promise.allSettled(snapshot.map((l) => l(\u6570\u636E)));
+    for (let [\u7D22\u5F15, \u7ED3\u679C\u9879] of \u7ED3\u679C.entries()) {
+      if (\u7ED3\u679C\u9879.status === "rejected" && this.\u9519\u8BEF\u5904\u7406\u5668 !== null) {
+        await Promise.resolve(this.\u9519\u8BEF\u5904\u7406\u5668(\u6570\u636E, \u7D22\u5F15, \u7ED3\u679C\u9879.reason));
+      }
     }
   }
-  async \u83B7\u5F97\u53E5\u67C4(id) {
-    return this.\u8FDE\u63A5\u8868[id] ?? null;
+};
+
+// src/global/model/web-socket.ts
+var WebSocket\u7BA1\u7406\u5668 = class {
+  log = \u5168\u5C40\u65E5\u5FD7\u5355\u4F8B.extend("WebSocket\u7BA1\u7406\u5668");
+  \u8FDE\u63A5\u8868 = {};
+  \u6D88\u606F\u76D1\u542C\u8868 = {};
+  \u8FDE\u63A5\u6E05\u7406\u6A21\u578B = new \u96C6\u7EBF\u5668\u6A21\u578B();
+  \u8FDE\u63A5\u6301\u6709\u8005\u8868 = {};
+  \u6E05\u7406\u51FD\u6570\u8868 = {};
+  \u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
+    if (id in this.\u8FDE\u63A5\u8868) this.\u5220\u9664\u8FDE\u63A5(id);
+    this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
+    if (!(id in this.\u6D88\u606F\u76D1\u542C\u8868)) {
+      let \u6A21\u578B = new \u96C6\u7EBF\u5668\u6A21\u578B();
+      \u6A21\u578B.\u8BBE\u7F6E\u9519\u8BEF\u5904\u7406\u5668(async (\u6570\u636E, \u7D22\u5F15, \u9519\u8BEF) => {
+        await this.log.warn(`WebSocket \u76D1\u542C\u5668\u6267\u884C\u5931\u8D25, id: ${id}, \u7D22\u5F15: ${\u7D22\u5F15}, \u9519\u8BEF: ${\u9519\u8BEF}`);
+      });
+      this.\u6D88\u606F\u76D1\u542C\u8868[id] = \u6A21\u578B;
+    }
+    this.\u6CE8\u518Conmessage(id, ws\u53E5\u67C4);
+    let \u6301\u6709\u8005 = this.\u8FDE\u63A5\u6E05\u7406\u6A21\u578B.\u6DFB\u52A0\u76D1\u542C\u5668(async () => {
+      if (id in this.\u8FDE\u63A5\u8868) this.\u5220\u9664\u8FDE\u63A5(id);
+    });
+    this.\u8FDE\u63A5\u6301\u6709\u8005\u8868[id] = \u6301\u6709\u8005;
+    return \u6301\u6709\u8005;
   }
   \u5220\u9664\u8FDE\u63A5(id) {
-    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) {
-      this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`).catch((a) => `\u65E5\u5FD7\u8F93\u51FA\u9519\u8BEF: ${a}: \u65E5\u5FD7\u5185\u5BB9: ${`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`}`);
+    let ws = this.\u8FDE\u63A5\u8868[id];
+    if (ws !== null && ws !== void 0) {
+      ws.onmessage = null;
+      ws.once("error", (err) => void this.log.error(`WebSocket \u5F02\u6B65\u9519\u8BEF, id: ${id}, \u9519\u8BEF: ${err}`));
+      ws.once(
+        "close",
+        (code, reason) => void this.log.debug(`WebSocket \u5DF2\u5173\u95ED, id: ${id}, \u5173\u95ED\u7801: ${code}, \u539F\u56E0: ${reason}`)
+      );
+      try {
+        ws.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
+      } catch (err) {
+        void this.log.error(`WebSocket \u540C\u6B65\u5173\u95ED\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
+      }
     }
-    \u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
+    let \u6E05\u7406\u51FD\u6570 = this.\u6E05\u7406\u51FD\u6570\u8868[id];
+    if (\u6E05\u7406\u51FD\u6570 !== void 0) void \u6E05\u7406\u51FD\u6570().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
     delete this.\u8FDE\u63A5\u8868[id];
     delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
     delete this.\u6D88\u606F\u76D1\u542C\u8868[id];
+    let \u6301\u6709\u8005 = this.\u8FDE\u63A5\u6301\u6709\u8005\u8868[id];
+    if (\u6301\u6709\u8005 !== void 0) {
+      this.\u8FDE\u63A5\u6E05\u7406\u6A21\u578B.\u79FB\u9664\u76D1\u542C\u5668(\u6301\u6709\u8005);
+      delete this.\u8FDE\u63A5\u6301\u6709\u8005\u8868[id];
+    }
   }
-  async \u6E05\u7406\u65E0\u6548\u8FDE\u63A5() {
-    let \u6E05\u7406\u6570\u91CF = 0;
-    for (let [id, ws] of Object.entries(this.\u8FDE\u63A5\u8868)) {
-      if (ws === null || ws.readyState === import_ws.WebSocket.CLOSED) {
-        this.\u5220\u9664\u8FDE\u63A5(id);
-        \u6E05\u7406\u6570\u91CF++;
+  \u6CE8\u518Conmessage(id, ws\u53E5\u67C4) {
+    ws\u53E5\u67C4.onmessage = async (event) => {
+      try {
+        let \u6570\u636E = JSON.parse(event.data.toString());
+        let \u6A21\u578B = this.\u6D88\u606F\u76D1\u542C\u8868[id];
+        if (\u6A21\u578B !== void 0) await \u6A21\u578B.\u5E7F\u64AD(\u6570\u636E);
+      } catch (err) {
+        await this.log.warn(`WebSocket \u6D88\u606F\u5904\u7406\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
       }
-    }
-    if (\u6E05\u7406\u6570\u91CF > 0) {
-      await this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
-    }
+    };
+  }
+  \u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(id) {
+    return id in this.\u8FDE\u63A5\u8868;
+  }
+  async \u83B7\u5F97ws\u53E5\u67C4(id) {
+    return this.\u8FDE\u63A5\u8868[id] ?? null;
+  }
+  async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
+    if (id in this.\u8FDE\u63A5\u8868) this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
+  }
+  \u8BBE\u7F6E\u6D88\u606F\u76D1\u542C(id, \u56DE\u8C03\u51FD\u6570) {
+    let \u6A21\u578B = this.\u6D88\u606F\u76D1\u542C\u8868[id];
+    if (\u6A21\u578B === void 0) return null;
+    return \u6A21\u578B.\u6DFB\u52A0\u76D1\u542C\u5668(\u56DE\u8C03\u51FD\u6570);
   }
 };
-var Global = new import_ts_global.GlobalService([
-  new import_ts_global.GlobalItem("log", log),
-  new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
-]);
 
-// 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/global/web-socket.ts
+var \u5168\u5C40WebSocket\u7BA1\u7406\u5668\u5355\u4F8B = new WebSocket\u7BA1\u7406\u5668();
 
 // src/server/server.ts
 var \u670D\u52A1\u5668 = class {
@@ -142,26 +184,28 @@ var \u670D\u52A1\u5668 = class {
   \u65E5\u5FD7\u56DE\u8C03;
   \u63A5\u53E3\u4EEC;
   \u7AEF\u53E3;
-  \u9759\u6001\u8D44\u6E90\u8DEF\u5F84;
-  \u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84;
+  \u52A8\u6001\u8DEF\u7531\u8868 = [];
+  \u9759\u6001\u8DEF\u7531\u8868 = /* @__PURE__ */ new Map();
   constructor(options) {
     this.\u63A5\u53E3\u4EEC = options.\u63A5\u53E3\u4EEC;
     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.\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;
-    });
+    this.log = \u5168\u5C40\u65E5\u5FD7\u5355\u4F8B;
+    if (this.\u65E5\u5FD7\u56DE\u8C03 !== void 0) this.log = this.log.pipe(this.\u65E5\u5FD7\u56DE\u8C03);
+    for (let \u63A5\u53E3 of this.\u63A5\u53E3\u4EEC) {
+      let \u8DEF\u5F84 = \u63A5\u53E3.\u83B7\u5F97\u8DEF\u5F84();
+      if (typeof \u8DEF\u5F84 === "string") {
+        let \u65B9\u6CD5 = \u63A5\u53E3.\u83B7\u5F97\u65B9\u6CD5();
+        let \u65B9\u6CD5\u8868 = this.\u9759\u6001\u8DEF\u7531\u8868.get(\u8DEF\u5F84) ?? /* @__PURE__ */ new Map();
+        \u65B9\u6CD5\u8868.set(\u65B9\u6CD5, \u63A5\u53E3);
+        this.\u9759\u6001\u8DEF\u7531\u8868.set(\u8DEF\u5F84, \u65B9\u6CD5\u8868);
+        continue;
+      }
+      this.\u52A8\u6001\u8DEF\u7531\u8868.push(\u63A5\u53E3);
+    }
   }
   async run() {
-    let log2 = await this.log;
     let app = (0, import_express.default)();
-    if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
-      await log2.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
-      app.use(import_express.default.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
-    }
     app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
     let server = app.listen(this.\u7AEF\u53E3);
     await this.\u521D\u59CB\u5316WebSocket(server);
@@ -169,91 +213,79 @@ var \u670D\u52A1\u5668 = class {
   }
   async \u5904\u7406\u8BF7\u6C42(req, res) {
     let \u8BF7\u6C42id = (0, import_short_uuid.default)().new();
-    let log2 = (await this.log).extend(\u8BF7\u6C42id);
+    let log = this.log.extend(\u8BF7\u6C42id);
+    let \u8BF7\u6C42\u9644\u52A0\u53C2\u6570 = { log, \u8BF7\u6C42id, webSocket\u7BA1\u7406\u5668: \u5168\u5C40WebSocket\u7BA1\u7406\u5668\u5355\u4F8B };
     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 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\u53E3) => \u8BF7\u6C42\u65B9\u6CD5 === \u63A5\u53E3.\u83B7\u5F97\u65B9\u6CD5() && \u8BF7\u6C42\u8DEF\u5F84 === \u63A5\u53E3.\u83B7\u5F97\u8DEF\u5F84()) ?? null;
+      await log.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
+      let \u76EE\u6807\u63A5\u53E3 = null;
+      let \u65B9\u6CD5\u8868 = this.\u9759\u6001\u8DEF\u7531\u8868.get(\u8BF7\u6C42\u8DEF\u5F84);
+      if (\u65B9\u6CD5\u8868 !== void 0) {
+        \u76EE\u6807\u63A5\u53E3 = \u65B9\u6CD5\u8868.get(\u8BF7\u6C42\u65B9\u6CD5) ?? null;
+      }
+      if (\u76EE\u6807\u63A5\u53E3 === null) {
+        \u76EE\u6807\u63A5\u53E3 = this.\u52A8\u6001\u8DEF\u7531\u8868.find((\u63A5\u53E3) => \u8BF7\u6C42\u65B9\u6CD5 === \u63A5\u53E3.\u83B7\u5F97\u65B9\u6CD5() && \u63A5\u53E3.\u5339\u914D\u8DEF\u5F84(\u8BF7\u6C42\u8DEF\u5F84)) ?? null;
+      }
       if (\u76EE\u6807\u63A5\u53E3 !== null) {
-        await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91({ req, res, \u76EE\u6807\u63A5\u53E3, log: log2, \u8BF7\u6C42id });
+        await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91({ req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570 });
         return;
       }
-      if (this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84 !== void 0 && \u8BF7\u6C42\u65B9\u6CD5 === "get") {
-        try {
-          let \u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9 = await (0, import_promises.readFile)(this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84, { encoding: "utf-8" });
-          res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
-          return;
-        } catch (e) {
-          await log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
-        }
-      }
-      await log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
+      await log.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
       res.status(404).end();
     } catch (error) {
-      await log2.error(error);
-      res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
+      await log.error(error);
+      res.setHeader("Content-Type", "text/html");
+      res.status(500).send("Internal Server Error");
     } finally {
       let \u8017\u65F6ms = Date.now() - \u5F00\u59CB\u65F6\u95F4;
-      await log2.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
+      await log.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
     }
   }
   async \u5904\u7406\u63A5\u53E3\u903B\u8F91(opt) {
-    let { req, res, \u76EE\u6807\u63A5\u53E3, log: log2, \u8BF7\u6C42id } = opt;
-    let \u63A5\u53E3\u903B\u8F91 = \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 { req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570 } = opt;
+    let log = \u8BF7\u6C42\u9644\u52A0\u53C2\u6570.log;
+    let \u63A5\u53E3\u903B\u8F91 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u903B\u8F91();
+    let \u63A5\u53E3\u8FD4\u56DE\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u8FD4\u56DE\u5668();
     let \u603B\u5F00\u59CB = Date.now();
     let \u5F00\u59CB = Date.now();
-    await log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
+    await log.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
     let \u63D2\u4EF6\u4EEC = \u63A5\u53E3\u903B\u8F91.\u83B7\u5F97\u63D2\u4EF6\u4EEC();
-    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\u8F91.\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\u8F91.\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 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);
-    let \u6B63\u786E\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u6B63\u786E\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
-    let \u6700\u7EC8\u7ED3\u679C;
-    if (\u9519\u8BEF\u7ED3\u679C.success === true) {
-      \u6700\u7EC8\u7ED3\u679C = \u9519\u8BEF\u7ED3\u679C.data;
-    } else if (\u6B63\u786E\u7ED3\u679C.success === true) {
-      \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 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`);
+    await log.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63D2\u4EF6\u4EEC.length);
+    let \u63D2\u4EF6\u7ED3\u679CE = await \u63A5\u53E3\u903B\u8F91.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
+    if (\u63D2\u4EF6\u7ED3\u679CE.isLeft()) {
+      let error = \u63D2\u4EF6\u7ED3\u679CE.assertLeft().getLeft();
+      await log.warn("\u63D2\u4EF6\u6267\u884C\u62D2\u7EDD: %d %o", error.code, error.data);
+      res.status(error.code).send(error.data);
+      return;
     }
-    let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
-    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)));
+    let \u63D2\u4EF6\u7ED3\u679C = \u63D2\u4EF6\u7ED3\u679CE.assertRight().getRight();
+    await log.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
+    await log.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
+    let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u8C03\u7528(\u63D2\u4EF6\u7ED3\u679C, {}, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
+    await log.debug("\u63A5\u53E3\u5B9E\u73B0\u6267\u884C\u5B8C\u6BD5");
+    let \u63A5\u53E3\u8017\u65F6 = Date.now() - \u5F00\u59CB;
+    await log.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
     \u5F00\u59CB = Date.now();
-    await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
+    \u63A5\u53E3\u8FD4\u56DE\u5668.\u5B9E\u73B0(req, res, \u63A5\u53E3\u7ED3\u679C, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
     let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
-    await log2.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
+    await log.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 log2.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
+    await log.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_ws2.WebSocketServer({ server });
+    let log = this.log;
+    let wss = new import_ws.WebSocketServer({ server });
     wss.on("listening", async () => {
-      await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
+      await log.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
     });
     wss.on("error", async (err) => {
-      await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
+      await log.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
     });
     wss.on("connection", async (ws, req) => {
-      let \u8FDE\u63A5log = log2.extend((0, import_short_uuid.default)().new());
+      let \u8FDE\u63A5log = log.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) {
@@ -261,7 +293,7 @@ var \u670D\u52A1\u5668 = class {
         return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u8FDE\u63A5log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
       }
       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 WebSocket\u7BA1\u7406\u56682 = \u5168\u5C40WebSocket\u7BA1\u7406\u5668\u5355\u4F8B;
       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 \u8FDE\u63A5log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
@@ -279,8 +311,8 @@ var \u670D\u52A1\u5668 = class {
       });
     });
   }
-  async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, code, reason) {
-    await log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
+  async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, code, reason) {
+    await log.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
     ws.close(code, reason);
   }
   \u83B7\u53D6\u672C\u5730\u5730\u5740() {

package/dist/cjs/server/server.d.cts

@@ -1,8 +1,41 @@
+import * as http from 'node:http';
+import { 任意接口 as ____ } from '../interface/interface-base.cjs';
+import '../types/types.cjs';
 import '@lsby/ts-log';
-import 'node:http';
-export { 日 as 日志回调类型, 服 as 服务器, 请 as 请求附加参数类型 } from '../interface-base-gRngpxki.cjs';
-import 'zod';
+import '../global/model/web-socket.cjs';
+import 'ws';
+import '../global/model/hub.cjs';
+import '../interface/interface-logic.cjs';
 import '@lsby/ts-fp-data';
 import 'express';
 import '../help/interior.cjs';
-import '../interface/interface-retuen.cjs';
+import '../interface/interface-plugin.cjs';
+import 'zod';
+import '../interface/interface-returner.cjs';
+
+type 日志回调类型 = (level: 'trace' | 'debug' | 'info' | 'warn' | 'error', namespace: string, content: string) => Promise<void>;
+declare class 服务器 {
+    private log;
+    private 日志回调?;
+    private 接口们;
+    private 端口;
+    private 动态路由表;
+    private 静态路由表;
+    constructor(options: {
+        接口们: ____[];
+        端口: number;
+        日志回调?: 日志回调类型;
+    });
+    run(): Promise<{
+        ip: string[];
+        api: string[];
+        server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
+    }>;
+    private 处理请求;
+    private 处理接口逻辑;
+    private 初始化WebSocket;
+    private 关闭WebSocket连接;
+    private 获取本地地址;
+}
+
+export { type 日志回调类型, 服务器 };

package/dist/cjs/symbol/export-type.cjs

@@ -23,7 +23,7 @@ __export(export_type_exports, {
   EXPORT_TYPE: () => EXPORT_TYPE
 });
 module.exports = __toCommonJS(export_type_exports);
-var EXPORT_TYPE = Symbol();
+var EXPORT_TYPE = /* @__PURE__ */ Symbol();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   EXPORT_TYPE

package/dist/cjs/types/types.cjs

@@ -0,0 +1,18 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/types/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/cjs/types/types.d.cts

@@ -0,0 +1,22 @@
+import { Log } from '@lsby/ts-log';
+import { WebSocket管理器 as WebSocket___ } from '../global/model/web-socket.cjs';
+import 'ws';
+import '../global/model/hub.cjs';
+
+type 空对象 = Record<PropertyKey, never>;
+type 兼容空对象 = Record<PropertyKey, unknown>;
+type 非空基本类型 = string | number | boolean;
+type 基本类型 = 非空基本类型 | null;
+type 递归基本类型 = 基本类型 | {
+    [k: PropertyKey]: 递归基本类型;
+} | Array<递归基本类型>;
+type 可序列化类型 = 基本类型 | {
+    [k: string]: 可序列化类型;
+} | Array<可序列化类型>;
+type 请求附加参数类型 = {
+    log: Log;
+    请求id: string;
+    webSocket管理器: WebSocket___;
+};
+
+export type { 兼容空对象, 可序列化类型, 基本类型, 空对象, 请求附加参数类型, 递归基本类型, 非空基本类型 };

package/dist/esm/bin/gen-api-list/bin.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 import {
   main
-} from "../../chunk-UKAZDGUR.js";
+} from "../../chunk-W7HT4TA6.js";
+import "../../chunk-2CGBESLT.js";
 
 // src/bin/gen-api-list/bin.ts
 import { Command } from "commander";

package/dist/esm/bin/gen-api-list/index.js

@@ -1,6 +1,7 @@
 import {
   main
-} from "../../chunk-UKAZDGUR.js";
+} from "../../chunk-W7HT4TA6.js";
+import "../../chunk-2CGBESLT.js";
 export {
   main
 };

package/dist/esm/bin/gen-api-type/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   main
-} from "../../chunk-2FCXR6G7.js";
+} from "../../chunk-J3N2TUYJ.js";
 
 // src/bin/gen-api-type/bin.ts
 import { Command } from "commander";

package/dist/esm/bin/gen-api-type/index.js

@@ -1,6 +1,6 @@
 import {
   main
-} from "../../chunk-2FCXR6G7.js";
+} from "../../chunk-J3N2TUYJ.js";
 export {
   main
 };

package/dist/esm/bin/gen-test/bin.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 import {
   main
-} from "../../chunk-AFWSZAXR.js";
+} from "../../chunk-HWIV3BTW.js";
+import "../../chunk-2CGBESLT.js";
 
 // src/bin/gen-test/bin.ts
 import { Command } from "commander";

package/dist/esm/bin/gen-test/index.js

@@ -1,6 +1,7 @@
 import {
   main
-} from "../../chunk-AFWSZAXR.js";
+} from "../../chunk-HWIV3BTW.js";
+import "../../chunk-2CGBESLT.js";
 export {
   main
 };

package/dist/esm/{chunk-ZIVQ3WZA.js → chunk-2CGBESLT.js}

@@ -10,14 +10,24 @@ function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
   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]);
+      if (Object.prototype.hasOwnProperty.call(\u6570\u636E, key)) \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
     }
     return \u65B0\u6570\u636E;
   }
   return \u6570\u636E;
 }
+function \u6570\u7EC4\u5408\u5E76(...\u6570\u7EC4\u4EEC) {
+  if (\u6570\u7EC4\u4EEC.length === 0) return [];
+  let \u6700\u5927\u957F\u5EA6 = Math.max(...\u6570\u7EC4\u4EEC.map((a) => a.length));
+  let \u7ED3\u679C = [];
+  for (let i = 0; i < \u6700\u5927\u957F\u5EA6; i++) {
+    \u7ED3\u679C.push(\u6570\u7EC4\u4EEC.map((a) => a[i]));
+  }
+  return \u7ED3\u679C;
+}
 
 export {
   截断字符串,
-  递归截断字符串
+  递归截断字符串,
+  数组合并
 };