@lsby/net-core 0.7.10 → 0.7.11-beta.2

package/dist/esm/{chunk-GMWVTFTC.js → chunk-XE7ESQZU.js}

@@ -1,14 +1,14 @@
 import {
   Global
-} from "./chunk-AB3GCWSG.js";
+} from "./chunk-567N5OFV.js";
 import {
   递归截断字符串
-} from "./chunk-NMG5C5AS.js";
+} from "./chunk-ZIVQ3WZA.js";
 
 // src/server/server.ts
 import express from "express";
-import { readFile } from "node:fs/promises";
-import { networkInterfaces } from "node:os";
+import { readFile } from "fs/promises";
+import { networkInterfaces } from "os";
 import short from "short-uuid";
 import { WebSocketServer } from "ws";
 var \u670D\u52A1\u5668 = class {
@@ -98,28 +98,28 @@ var \u670D\u52A1\u5668 = class {
     });
     wss.on("connection", async (ws, req) => {
       let log = logBase.extend(short().new()).extend("WebSocket");
-      await log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
+      log.debugSync("\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("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
+        log.errorSync("\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\u5668 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
-      let \u8FDE\u63A5\u5DF2\u5B58\u5728 = await WebSocket\u7BA1\u7406\u5668.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
+      log.debugSync("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
+      let WebSocket\u7BA1\u7406\u5668 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
+      let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u5668.\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);
+        log.errorSync("\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\u5668.\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);
+      WebSocket\u7BA1\u7406\u5668.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
+      log.infoSync("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
       ws.on("close", async () => {
-        await log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
-        await WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
+        log.infoSync("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
+        WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
       });
       ws.on("error", async (err) => {
-        await log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
-        await WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
+        log.errorSync("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
+        WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
       });
     });
   }

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

@@ -1,20 +1,16 @@
 // 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) + "...";
+  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 === "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]);
+      if (\u6570\u636E.hasOwnProperty(key) === true) \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
     }
     return \u65B0\u6570\u636E;
   }

package/dist/esm/global/global.d.ts

@@ -1,8 +1,19 @@
-import { GlobalService, GlobalAsyncItem } from '@lsby/ts-global';
+import { GlobalService, GlobalItem } from '@lsby/ts-global';
 import { Log } from '@lsby/ts-log';
-import { WebSocket管理器 as WebSocket___ } from './web-socket-management.js';
-import 'ws';
+import { WebSocket } from 'ws';
 
-declare let Global: GlobalService<[GlobalAsyncItem<"log", Log>, GlobalAsyncItem<"WebSocket管理器", WebSocket___>]>;
+type id = string;
+declare class WebSocket管理器 {
+    private 连接表;
+    private log;
+    private 清理函数表;
+    constructor(连接表: Record<id, WebSocket | null>);
+    增加连接(id: id, ws句柄: WebSocket): void;
+    查询连接存在(id: string): boolean;
+    设置清理函数(id: string, 清理函数: () => Promise<void>): Promise<void>;
+    获得句柄(id: id): Promise<WebSocket | null>;
+    删除连接(id: string): void;
+}
+declare let Global: GlobalService<[GlobalItem<"log", Log>, GlobalItem<"WebSocket管理器", WebSocket管理器>]>;
 
-export { Global };
+export { Global, WebSocket管理器 };

package/dist/esm/global/global.js

@@ -1,6 +1,8 @@
 import {
-  Global
-} from "../chunk-AB3GCWSG.js";
+  Global,
+  WebSocket管理器
+} from "../chunk-567N5OFV.js";
 export {
-  Global
+  Global,
+  WebSocket\u7BA1\u7406\u5668
 };

package/dist/esm/help/interior.js

@@ -1,7 +1,7 @@
 import {
   截断字符串,
   递归截断字符串
-} from "../chunk-NMG5C5AS.js";
+} from "../chunk-ZIVQ3WZA.js";
 export {
   \u622A\u65AD\u5B57\u7B26\u4E32,
   \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32

package/dist/esm/index.js

@@ -1,36 +1,33 @@
-import {
-  中文路径支持插件
-} from "./chunk-47T4ZLNQ.js";
 import {
   自定义数据插件
-} from "./chunk-RHDBIJPA.js";
+} from "./chunk-H3HM4O7J.js";
 import {
   JSON解析插件
-} from "./chunk-2I2MJFB2.js";
+} from "./chunk-B2WM3PYV.js";
 import {
   调试请求头插件
 } from "./chunk-7MHKNSNT.js";
 import {
   GET参数解析插件
-} from "./chunk-2JQ7AEO4.js";
+} from "./chunk-6SGTOPVW.js";
 import {
   发送文件插件
 } from "./chunk-RRUUWHTF.js";
 import {
   表单解析插件
-} from "./chunk-G6IT6LW7.js";
+} from "./chunk-NSW5G2QM.js";
 import {
   WebSocket插件
-} from "./chunk-ZGH3QIDP.js";
+} from "./chunk-2SPIZUHY.js";
+import {
+  中文路径支持插件
+} from "./chunk-4BFNDHRC.js";
 import {
   接口测试
 } from "./chunk-N7TPWCQ5.js";
-import {
-  插件
-} from "./chunk-43GZE5YL.js";
 import {
   服务器
-} from "./chunk-GMWVTFTC.js";
+} from "./chunk-XE7ESQZU.js";
 import {
   EXPORT_TYPE
 } from "./chunk-ZF7EC2OM.js";
@@ -46,19 +43,22 @@ import {
   常用形式转换器,
   接口结果转换器
 } from "./chunk-AEG7V7QY.js";
-import "./chunk-AB3GCWSG.js";
+import "./chunk-567N5OFV.js";
 import {
   构造元组,
   构造对象
 } from "./chunk-YMH6HJJF.js";
-import "./chunk-NMG5C5AS.js";
+import "./chunk-ZIVQ3WZA.js";
+import {
+  插件
+} from "./chunk-43GZE5YL.js";
 import {
   接口
 } from "./chunk-JMR7QAHO.js";
 import {
   接口逻辑,
   接口逻辑Base
-} from "./chunk-DI6KYJ65.js";
+} from "./chunk-LZKS5TUK.js";
 export {
   EXPORT_TYPE,
   GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,

package/dist/esm/interface/interface-logic.js

@@ -1,7 +1,7 @@
 import {
   接口逻辑,
   接口逻辑Base
-} from "../chunk-DI6KYJ65.js";
+} from "../chunk-LZKS5TUK.js";
 export {
   \u63A5\u53E3\u903B\u8F91,
   \u63A5\u53E3\u903B\u8F91Base

package/dist/esm/plugin/extend/chinese-path.js

@@ -1,6 +1,6 @@
 import {
   中文路径支持插件
-} from "../../chunk-47T4ZLNQ.js";
+} from "../../chunk-4BFNDHRC.js";
 import "../../chunk-43GZE5YL.js";
 export {
   \u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6

package/dist/esm/plugin/extend/custom-data.js

@@ -1,8 +1,8 @@
 import {
   自定义数据插件
-} from "../../chunk-RHDBIJPA.js";
+} from "../../chunk-H3HM4O7J.js";
+import "../../chunk-567N5OFV.js";
 import "../../chunk-43GZE5YL.js";
-import "../../chunk-AB3GCWSG.js";
 export {
   \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6
 };

package/dist/esm/plugin/extend/json.js

@@ -1,8 +1,8 @@
 import {
   JSON解析插件
-} from "../../chunk-2I2MJFB2.js";
+} from "../../chunk-B2WM3PYV.js";
+import "../../chunk-ZIVQ3WZA.js";
 import "../../chunk-43GZE5YL.js";
-import "../../chunk-NMG5C5AS.js";
 export {
   JSON\u89E3\u6790\u63D2\u4EF6
 };

package/dist/esm/plugin/extend/query.js

@@ -1,8 +1,8 @@
 import {
   GET参数解析插件
-} from "../../chunk-2JQ7AEO4.js";
+} from "../../chunk-6SGTOPVW.js";
+import "../../chunk-ZIVQ3WZA.js";
 import "../../chunk-43GZE5YL.js";
-import "../../chunk-NMG5C5AS.js";
 export {
   GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6
 };

package/dist/esm/plugin/extend/urlencoded.js

@@ -1,8 +1,8 @@
 import {
   表单解析插件
-} from "../../chunk-G6IT6LW7.js";
+} from "../../chunk-NSW5G2QM.js";
+import "../../chunk-567N5OFV.js";
 import "../../chunk-43GZE5YL.js";
-import "../../chunk-AB3GCWSG.js";
 export {
   \u8868\u5355\u89E3\u6790\u63D2\u4EF6
 };

package/dist/esm/plugin/extend/web-socket.js

@@ -1,8 +1,8 @@
 import {
   WebSocket插件
-} from "../../chunk-ZGH3QIDP.js";
+} from "../../chunk-2SPIZUHY.js";
+import "../../chunk-567N5OFV.js";
 import "../../chunk-43GZE5YL.js";
-import "../../chunk-AB3GCWSG.js";
 export {
   WebSocket\u63D2\u4EF6
 };

package/dist/esm/server/server.js

@@ -1,8 +1,8 @@
 import {
   服务器
-} from "../chunk-GMWVTFTC.js";
-import "../chunk-AB3GCWSG.js";
-import "../chunk-NMG5C5AS.js";
+} from "../chunk-XE7ESQZU.js";
+import "../chunk-567N5OFV.js";
+import "../chunk-ZIVQ3WZA.js";
 export {
   \u670D\u52A1\u5668
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsby/net-core",
-  "version": "0.7.10",
+  "version": "0.7.11-beta.2",
   "type": "module",
   "exports": {
     "require": "./dist/cjs/index.cjs",
@@ -59,7 +59,7 @@
     "prettier": "3.3.3",
     "prettier-plugin-organize-imports": "^4.1.0",
     "prettier-plugin-packagejson": "^2.5.2",
-    "tsup": "^8.0.2",
+    "tsup": "^8.5.0",
     "typescript": "<5.6.0"
   },
   "peerDependencies": {

package/dist/cjs/global/web-socket-management.cjs

@@ -1,80 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-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/global/web-socket-management.ts
-var web_socket_management_exports = {};
-__export(web_socket_management_exports, {
-  WebSocket\u7BA1\u7406\u5668: () => WebSocket\u7BA1\u7406\u5668
-});
-module.exports = __toCommonJS(web_socket_management_exports);
-
-// src/global/global.ts
-var import_ts_global = require("@lsby/ts-global");
-var import_ts_log = require("@lsby/ts-log");
-var Global = new import_ts_global.GlobalService([
-  new import_ts_global.GlobalAsyncItem("log", async () => {
-    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({});
-  })
-]);
-
-// src/global/web-socket-management.ts
-var WebSocket\u7BA1\u7406\u5668 = class {
-  constructor(\u8FDE\u63A5\u8868) {
-    this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
-  }
-  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 \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) {
-    if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
-      return;
-    this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
-  }
-  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}`);
-    }
-    try {
-      await \u6E05\u7406\u51FD\u6570?.();
-    } catch (err) {
-      await 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];
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  WebSocket\u7BA1\u7406\u5668
-});

package/dist/cjs/global/web-socket-management.d.cts

@@ -1,16 +0,0 @@
-import { WebSocket } from 'ws';
-
-type id = string;
-declare class WebSocket管理器 {
-    private 连接表;
-    private log;
-    private 清理函数表;
-    constructor(连接表: Record<id, WebSocket | null>);
-    增加连接(id: id, ws句柄: WebSocket): Promise<void>;
-    查询连接存在(id: string): Promise<boolean>;
-    设置清理函数(id: string, 清理函数: () => Promise<void>): Promise<void>;
-    获得句柄(id: id): Promise<WebSocket | null>;
-    删除连接(id: string): Promise<void>;
-}
-
-export { WebSocket管理器 };

package/dist/esm/global/web-socket-management.d.ts

@@ -1,16 +0,0 @@
-import { WebSocket } from 'ws';
-
-type id = string;
-declare class WebSocket管理器 {
-    private 连接表;
-    private log;
-    private 清理函数表;
-    constructor(连接表: Record<id, WebSocket | null>);
-    增加连接(id: id, ws句柄: WebSocket): Promise<void>;
-    查询连接存在(id: string): Promise<boolean>;
-    设置清理函数(id: string, 清理函数: () => Promise<void>): Promise<void>;
-    获得句柄(id: id): Promise<WebSocket | null>;
-    删除连接(id: string): Promise<void>;
-}
-
-export { WebSocket管理器 };

package/dist/esm/global/web-socket-management.js

@@ -1,6 +0,0 @@
-import {
-  WebSocket管理器
-} from "../chunk-AB3GCWSG.js";
-export {
-  WebSocket\u7BA1\u7406\u5668
-};