@lsby/net-core 0.9.0 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/dist/cjs/index.cjs +105 -108
  2. package/dist/cjs/index.d.cts +1 -1
  3. package/dist/cjs/interface/interface-base.d.cts +1 -1
  4. package/dist/cjs/interface/interface-logic.cjs +4 -4
  5. package/dist/cjs/interface/interface-logic.d.cts +1 -1
  6. package/dist/cjs/interface/interface-result.d.cts +1 -1
  7. package/dist/cjs/{interface-base-Dy-CTJVo.d.cts → interface-base-Dq8o7vnl.d.cts} +3 -2
  8. package/dist/cjs/plugin/extend/custom-data.cjs +2 -62
  9. package/dist/cjs/plugin/extend/custom-data.d.cts +1 -2
  10. package/dist/cjs/plugin/extend/json.d.cts +1 -1
  11. package/dist/cjs/plugin/extend/log-headers.d.cts +1 -1
  12. package/dist/cjs/plugin/extend/query.d.cts +1 -1
  13. package/dist/cjs/plugin/extend/send-file-plugin.d.cts +1 -1
  14. package/dist/cjs/plugin/extend/urlencoded.cjs +2 -62
  15. package/dist/cjs/plugin/extend/urlencoded.d.cts +1 -2
  16. package/dist/cjs/plugin/extend/web-socket.cjs +0 -1
  17. package/dist/cjs/plugin/extend/web-socket.d.cts +1 -2
  18. package/dist/cjs/plugin/plug.d.cts +1 -1
  19. package/dist/cjs/server/server.cjs +40 -42
  20. package/dist/cjs/server/server.d.cts +1 -1
  21. package/dist/cjs/wrapper/common-wrapper-return.d.cts +1 -1
  22. package/dist/cjs/wrapper/common-wrapper.d.cts +1 -1
  23. package/dist/cjs/wrapper/deferred-result-wrapper.d.cts +1 -1
  24. package/dist/esm/{chunk-ST4PR6O3.js → chunk-BDY77BE7.js} +4 -4
  25. package/dist/esm/{chunk-SS6FF7Y2.js → chunk-RRM3JVJB.js} +43 -45
  26. package/dist/esm/{chunk-EW7SZA75.js → chunk-VJFTSMHQ.js} +3 -4
  27. package/dist/esm/{chunk-NAQTIAMT.js → chunk-VMCAX3QH.js} +0 -4
  28. package/dist/esm/{chunk-JSSODPOL.js → chunk-XEV5RHGZ.js} +0 -4
  29. package/dist/esm/index.d.ts +1 -1
  30. package/dist/esm/index.js +19 -19
  31. package/dist/esm/interface/interface-base.d.ts +1 -1
  32. package/dist/esm/interface/interface-logic.d.ts +1 -1
  33. package/dist/esm/interface/interface-logic.js +1 -1
  34. package/dist/esm/interface/interface-result.d.ts +1 -1
  35. package/dist/esm/{interface-base-BCiBG0At.d.ts → interface-base-CKPWT5C9.d.ts} +3 -2
  36. package/dist/esm/plugin/extend/custom-data.d.ts +1 -2
  37. package/dist/esm/plugin/extend/custom-data.js +1 -2
  38. package/dist/esm/plugin/extend/json.d.ts +1 -1
  39. package/dist/esm/plugin/extend/json.js +2 -2
  40. package/dist/esm/plugin/extend/log-headers.d.ts +1 -1
  41. package/dist/esm/plugin/extend/query.d.ts +1 -1
  42. package/dist/esm/plugin/extend/query.js +2 -2
  43. package/dist/esm/plugin/extend/send-file-plugin.d.ts +1 -1
  44. package/dist/esm/plugin/extend/urlencoded.d.ts +1 -2
  45. package/dist/esm/plugin/extend/urlencoded.js +1 -2
  46. package/dist/esm/plugin/extend/web-socket.d.ts +1 -2
  47. package/dist/esm/plugin/extend/web-socket.js +2 -2
  48. package/dist/esm/plugin/plug.d.ts +1 -1
  49. package/dist/esm/server/server.d.ts +1 -1
  50. package/dist/esm/server/server.js +2 -2
  51. package/dist/esm/wrapper/common-wrapper-return.d.ts +1 -1
  52. package/dist/esm/wrapper/common-wrapper-return.js +2 -2
  53. package/dist/esm/wrapper/common-wrapper.d.ts +1 -1
  54. package/dist/esm/wrapper/common-wrapper.js +2 -2
  55. package/dist/esm/wrapper/deferred-result-wrapper.d.ts +1 -1
  56. package/dist/esm/wrapper/deferred-result-wrapper.js +2 -2
  57. package/package.json +1 -1
  58. package/dist/esm/{chunk-AY6KWNWX.js → chunk-6SGTOPVW.js} +3 -3
  59. package/dist/esm/{chunk-JXTWTY2S.js → chunk-AP57BLCR.js} +3 -3
  60. package/dist/esm/{chunk-GMYXAJS3.js → chunk-B2WM3PYV.js} +3 -3
  61. package/dist/esm/{chunk-WECMWUFB.js → chunk-GGR24VBS.js} +3 -3
  62. package/dist/esm/{chunk-LZOZF4CS.js → chunk-WXP6N5FD.js} +3 -3
@@ -36,65 +36,6 @@ module.exports = __toCommonJS(urlencoded_exports);
36
36
  var import_express = __toESM(require("express"), 1);
37
37
  var import_node_util = require("util");
38
38
 
39
- // src/global/global.ts
40
- var import_ts_global = require("@lsby/ts-global");
41
- var import_ts_log = require("@lsby/ts-log");
42
- var import_ws = require("ws");
43
- var log = new import_ts_log.Log("@lsby:net-core");
44
- var WebSocket\u7BA1\u7406\u5668 = class {
45
- constructor(\u8FDE\u63A5\u8868) {
46
- this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
47
- this.\u5B9A\u65F6\u5668ID = setInterval(() => {
48
- this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
49
- 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}`}`);
50
- });
51
- }, 3e4);
52
- }
53
- log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
54
- \u6E05\u7406\u51FD\u6570\u8868 = {};
55
- \u5B9A\u65F6\u5668ID = null;
56
- \u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
57
- this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
58
- }
59
- \u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(id) {
60
- return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
61
- }
62
- async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
63
- if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
64
- this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
65
- }
66
- async \u83B7\u5F97\u53E5\u67C4(id) {
67
- return this.\u8FDE\u63A5\u8868[id] ?? null;
68
- }
69
- \u5220\u9664\u8FDE\u63A5(id) {
70
- let \u6E05\u7406\u51FD\u6570 = this.\u6E05\u7406\u51FD\u6570\u8868[id];
71
- try {
72
- this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
73
- } catch (err) {
74
- 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}`}`);
75
- }
76
- \u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
77
- delete this.\u8FDE\u63A5\u8868[id];
78
- delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
79
- }
80
- async \u6E05\u7406\u65E0\u6548\u8FDE\u63A5() {
81
- let \u6E05\u7406\u6570\u91CF = 0;
82
- for (let [id, ws] of Object.entries(this.\u8FDE\u63A5\u8868)) {
83
- if (ws === null || ws.readyState === import_ws.WebSocket.CLOSED) {
84
- this.\u5220\u9664\u8FDE\u63A5(id);
85
- \u6E05\u7406\u6570\u91CF++;
86
- }
87
- }
88
- if (\u6E05\u7406\u6570\u91CF > 0) {
89
- await this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
90
- }
91
- }
92
- };
93
- var Global = new import_ts_global.GlobalService([
94
- new import_ts_global.GlobalItem("log", log),
95
- new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
96
- ]);
97
-
98
39
  // src/plugin/plug.ts
99
40
  var \u63D2\u4EF6 = class {
100
41
  constructor(\u7C7B\u578B, \u5B9E\u73B0) {
@@ -111,10 +52,9 @@ var \u63D2\u4EF6 = class {
111
52
 
112
53
  // src/plugin/extend/urlencoded.ts
113
54
  var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
114
- log = Global.getItem("log");
115
55
  constructor(t, opt) {
116
56
  super(t, async (req, res, \u9644\u52A0\u53C2\u6570) => {
117
- let log2 = \u9644\u52A0\u53C2\u6570.log.extend("JSON\u89E3\u6790\u63D2\u4EF6");
57
+ let log = \u9644\u52A0\u53C2\u6570.log.extend("JSON\u89E3\u6790\u63D2\u4EF6");
118
58
  await new Promise(
119
59
  (pRes, _rej) => import_express.default.urlencoded({ extended: true, ...opt })(req, res, () => {
120
60
  pRes(null);
@@ -122,7 +62,7 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
122
62
  );
123
63
  let parseResult = t.safeParse(req.body);
124
64
  if (parseResult.success === false) {
125
- await log2.error("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error);
65
+ await log.error("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error);
126
66
  throw new Error((0, import_node_util.format)("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error));
127
67
  }
128
68
  return parseResult.data;
@@ -1,6 +1,6 @@
1
1
  import express from 'express';
2
2
  import { z } from 'zod';
3
- import { 插 as __ } from '../../interface-base-Dy-CTJVo.cjs';
3
+ import { 插 as __ } from '../../interface-base-Dq8o7vnl.cjs';
4
4
  import '@lsby/ts-fp-data';
5
5
  import '../../help/interior.cjs';
6
6
  import '@lsby/ts-log';
@@ -8,7 +8,6 @@ import 'node:http';
8
8
  import '../../interface/interface-retuen.cjs';
9
9
 
10
10
  declare class 表单解析插件<Result extends z.AnyZodObject> extends __<Result> {
11
- private log;
12
11
  constructor(t: Result, opt: Parameters<typeof express.urlencoded>[0]);
13
12
  }
14
13
 
@@ -101,7 +101,6 @@ var \u63D2\u4EF6 = class {
101
101
 
102
102
  // src/plugin/extend/web-socket.ts
103
103
  var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
104
- log = Global.getItem("log");
105
104
  constructor(\u4FE1\u606F\u63CF\u8FF0) {
106
105
  super(
107
106
  import_zod.z.object({
@@ -1,5 +1,5 @@
1
1
  import { z } from 'zod';
2
- import { 插 as __, A as _____ } from '../../interface-base-Dy-CTJVo.cjs';
2
+ import { 插 as __, A as _____ } from '../../interface-base-Dq8o7vnl.cjs';
3
3
  import '@lsby/ts-fp-data';
4
4
  import 'express';
5
5
  import '../../help/interior.cjs';
@@ -17,7 +17,6 @@ declare class WebSocket插件<信息 extends z.AnyZodObject | z.ZodUnion<any>> e
17
17
  z.ZodNull
18
18
  ]>;
19
19
  }>> {
20
- private log;
21
20
  constructor(信息描述: 信息);
22
21
  }
23
22
  type 任意WS插件 = WebSocket插件<any>;
@@ -1,6 +1,6 @@
1
1
  import 'express';
2
2
  import 'zod';
3
- export { z as 任意插件, B as 取插件内部ts类型, 取 as 取插件内部类型, 合 as 合并插件结果, 插 as 插件, A as 插件项类型 } from '../interface-base-Dy-CTJVo.cjs';
3
+ export { z as 任意插件, B as 取插件内部ts类型, 取 as 取插件内部类型, 合 as 合并插件结果, 插 as 插件, A as 插件项类型 } from '../interface-base-Dq8o7vnl.cjs';
4
4
  import '@lsby/ts-fp-data';
5
5
  import '../help/interior.cjs';
6
6
  import '@lsby/ts-log';
@@ -119,7 +119,8 @@ function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
119
119
 
120
120
  // src/server/server.ts
121
121
  var \u670D\u52A1\u5668 = class {
122
- log;
122
+ \u7CFB\u7EDFlog = Global.getItem("log");
123
+ \u63A5\u53E3log;
123
124
  \u63A5\u53E3\u4EEC;
124
125
  \u7AEF\u53E3;
125
126
  \u9759\u6001\u8D44\u6E90\u8DEF\u5F84;
@@ -129,13 +130,13 @@ var \u670D\u52A1\u5668 = class {
129
130
  this.\u7AEF\u53E3 = options.\u7AEF\u53E3;
130
131
  this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 = options.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84;
131
132
  this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84 = options.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84;
132
- this.log = options.log !== void 0 ? Promise.resolve(options.log) : Global.getItem("log");
133
+ this.\u63A5\u53E3log = options.log !== void 0 ? Promise.resolve(options.log) : Global.getItem("log");
133
134
  }
134
135
  async run() {
135
- let log2 = (await this.log).extend("\u670D\u52A1\u5668");
136
136
  let app = (0, import_express.default)();
137
+ let \u7CFB\u7EDFlog = await this.\u7CFB\u7EDFlog;
137
138
  if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
138
- await log2.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
139
+ await \u7CFB\u7EDFlog.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
139
140
  app.use(import_express.default.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
140
141
  }
141
142
  app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
@@ -145,17 +146,17 @@ var \u670D\u52A1\u5668 = class {
145
146
  }
146
147
  async \u5904\u7406\u8BF7\u6C42(req, res) {
147
148
  let \u8BF7\u6C42id = (0, import_short_uuid.default)().new();
148
- let \u4E3Blog = (await this.log).extend(\u8BF7\u6C42id);
149
- let log2 = \u4E3Blog.extend("\u63A7\u5236\u5668");
149
+ let \u7CFB\u7EDFlog = (await this.\u7CFB\u7EDFlog).extend(\u8BF7\u6C42id);
150
+ let \u63A5\u53E3log = (await this.\u63A5\u53E3log).extend(\u8BF7\u6C42id);
150
151
  let \u5F00\u59CB\u65F6\u95F4 = Date.now();
151
152
  try {
152
153
  let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
153
154
  \u8BF7\u6C42\u8DEF\u5F84 = decodeURIComponent(\u8BF7\u6C42\u8DEF\u5F84);
154
155
  let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
155
- await log2.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
156
+ await \u7CFB\u7EDFlog.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
156
157
  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;
157
158
  if (\u76EE\u6807\u63A5\u53E3 !== null) {
158
- await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, { log: \u4E3Blog });
159
+ await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u63A5\u53E3log, \u7CFB\u7EDFlog);
159
160
  return;
160
161
  }
161
162
  if (this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84 !== void 0 && \u8BF7\u6C42\u65B9\u6CD5 === "get") {
@@ -164,31 +165,30 @@ var \u670D\u52A1\u5668 = class {
164
165
  res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
165
166
  return;
166
167
  } catch (e) {
167
- await log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
168
+ await \u7CFB\u7EDFlog.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
168
169
  }
169
170
  }
170
- await log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
171
+ await \u7CFB\u7EDFlog.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
171
172
  res.status(404).end();
172
173
  } catch (error) {
173
- await log2.error(error);
174
+ await \u7CFB\u7EDFlog.error(error);
174
175
  res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
175
176
  } finally {
176
177
  let \u8017\u65F6ms = Date.now() - \u5F00\u59CB\u65F6\u95F4;
177
- await \u4E3Blog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
178
+ await \u7CFB\u7EDFlog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
178
179
  }
179
180
  }
180
- async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
181
- let log2 = \u8BF7\u6C42\u9644\u52A0\u53C2\u6570.log.extend("\u5904\u7406\u63A5\u53E3\u903B\u8F91");
181
+ async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u63A5\u53E3log, \u7CFB\u7EDFlog) {
182
182
  let \u63A5\u53E3\u903B\u8F91 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u903B\u8F91();
183
183
  let \u7ED3\u679C\u8F6C\u6362\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8F6C\u6362\u5668();
184
184
  let \u7ED3\u679C\u8FD4\u56DE\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8FD4\u56DE\u5668();
185
185
  let \u603B\u5F00\u59CB = Date.now();
186
186
  let \u5F00\u59CB = Date.now();
187
- await log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
188
- let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
189
- let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u63D2\u4EF6\u7ED3\u679C, {}, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
187
+ await \u7CFB\u7EDFlog.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
188
+ let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, { log: \u7CFB\u7EDFlog });
189
+ let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u63D2\u4EF6\u7ED3\u679C, {}, { log: \u63A5\u53E3log });
190
190
  let \u63A5\u53E3\u8017\u65F6 = Date.now() - \u5F00\u59CB;
191
- await log2.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
191
+ await \u7CFB\u7EDFlog.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
192
192
  \u5F00\u59CB = Date.now();
193
193
  let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
194
194
  let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
@@ -200,61 +200,59 @@ var \u670D\u52A1\u5668 = class {
200
200
  \u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
201
201
  } else {
202
202
  let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
203
- await log2.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
204
- await log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
205
- await log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
203
+ await \u7CFB\u7EDFlog.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
204
+ await \u7CFB\u7EDFlog.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
205
+ await \u7CFB\u7EDFlog.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
206
206
  throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
207
207
  }
208
208
  let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
209
- await log2.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
210
- await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
209
+ await \u7CFB\u7EDFlog.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
210
+ await \u7CFB\u7EDFlog.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
211
211
  \u5F00\u59CB = Date.now();
212
212
  await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
213
213
  let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
214
- await log2.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
214
+ await \u7CFB\u7EDFlog.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
215
215
  let \u603B\u8017\u65F6 = Date.now() - \u603B\u5F00\u59CB;
216
- await log2.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
216
+ await \u7CFB\u7EDFlog.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
217
217
  }
218
218
  async \u521D\u59CB\u5316WebSocket(server) {
219
219
  let wss = new import_ws2.WebSocketServer({ server });
220
- let logBase = await this.log;
220
+ let \u7CFB\u7EDFlog = await this.\u7CFB\u7EDFlog;
221
221
  wss.on("listening", async () => {
222
- let log2 = logBase;
223
- await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
222
+ await \u7CFB\u7EDFlog.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
224
223
  });
225
224
  wss.on("error", async (err) => {
226
- let log2 = logBase;
227
- await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
225
+ await \u7CFB\u7EDFlog.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
228
226
  });
229
227
  wss.on("connection", async (ws, req) => {
230
- let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
231
- await log2.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
228
+ let \u63A5\u53E3log = \u7CFB\u7EDFlog.extend((0, import_short_uuid.default)().new());
229
+ await \u63A5\u53E3log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
232
230
  let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
233
231
  if (\u5BA2\u6237\u7AEFid === null) {
234
- await log2.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
235
- return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
232
+ await \u63A5\u53E3log.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
233
+ return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u63A5\u53E3log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
236
234
  }
237
- await log2.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
235
+ await \u63A5\u53E3log.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
238
236
  let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
239
237
  let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
240
238
  if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
241
- await log2.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
242
- return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
239
+ await \u63A5\u53E3log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
240
+ return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u63A5\u53E3log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
243
241
  }
244
242
  WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
245
- await log2.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
243
+ await \u63A5\u53E3log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
246
244
  ws.on("close", async () => {
247
- await log2.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
245
+ await \u63A5\u53E3log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
248
246
  WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
249
247
  });
250
248
  ws.on("error", async (err) => {
251
- await log2.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
249
+ await \u63A5\u53E3log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
252
250
  WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
253
251
  });
254
252
  });
255
253
  }
256
- async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, code, reason) {
257
- await log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
254
+ async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u63A5\u53E3log, code, reason) {
255
+ await \u63A5\u53E3log.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
258
256
  ws.close(code, reason);
259
257
  }
260
258
  \u83B7\u53D6\u672C\u5730\u5730\u5740() {
@@ -1,6 +1,6 @@
1
1
  import '@lsby/ts-log';
2
2
  import 'node:http';
3
- export { 服 as 服务器, 请 as 请求附加参数类型 } from '../interface-base-Dy-CTJVo.cjs';
3
+ export { 服 as 服务器, 请 as 请求附加参数类型 } from '../interface-base-Dq8o7vnl.cjs';
4
4
  import 'zod';
5
5
  import '@lsby/ts-fp-data';
6
6
  import 'express';
@@ -1,6 +1,6 @@
1
1
  import { Request, Response } from 'express';
2
2
  import { z } from 'zod';
3
- import { 接 as ______, a as ______$1, l as ____Base, 空 as ___, b as __, 常 as _______, q as __________, r as __________$1 } from '../interface-base-Dy-CTJVo.cjs';
3
+ import { 接 as ______, a as ______$1, l as ____Base, 空 as ___, b as __, 常 as _______, q as __________, r as __________$1 } from '../interface-base-Dq8o7vnl.cjs';
4
4
  import { 自定义返回器 as ______$2 } from '../interface/interface-retuen.cjs';
5
5
  import '@lsby/ts-fp-data';
6
6
  import '../help/interior.cjs';
@@ -1,5 +1,5 @@
1
1
  import { z } from 'zod';
2
- import { 接 as ______, a as ______$1, l as ____Base, 空 as ___, b as __, 常 as _______, q as __________, r as __________$1 } from '../interface-base-Dy-CTJVo.cjs';
2
+ import { 接 as ______, a as ______$1, l as ____Base, 空 as ___, b as __, 常 as _______, q as __________, r as __________$1 } from '../interface-base-Dq8o7vnl.cjs';
3
3
  import { 常用返回器 as _____ } from '../interface/interface-retuen.cjs';
4
4
  import '@lsby/ts-fp-data';
5
5
  import 'express';
@@ -1,5 +1,5 @@
1
1
  import { z } from 'zod';
2
- import { 接 as ______, a as ______$1, l as ____Base, 空 as ___, b as __, y as ___________, q as __________, r as __________$1 } from '../interface-base-Dy-CTJVo.cjs';
2
+ import { 接 as ______, a as ______$1, l as ____Base, 空 as ___, b as __, y as ___________, q as __________, r as __________$1 } from '../interface-base-Dq8o7vnl.cjs';
3
3
  import { 常用返回器 as _____ } from '../interface/interface-retuen.cjs';
4
4
  import '@lsby/ts-fp-data';
5
5
  import 'express';
@@ -38,20 +38,20 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
38
38
  await \u65E5\u5FD7\u5BF9\u8C61.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
39
39
  return \u5408\u5E76\u7ED3\u679C;
40
40
  }
41
- async \u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570) {
42
- let log = \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570.log.extend("\u63A5\u53E3\u903B\u8F91");
41
+ async \u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
42
+ let log = \u4F20\u5165\u7684\u8BF7\u6C42\u9644\u52A0\u53C2\u6570.log.extend("\u63A5\u53E3\u903B\u8F91");
43
43
  let \u6E05\u7406\u51FD\u6570 = this.\u83B7\u5F97\u6E05\u7406\u51FD\u6570?.();
44
44
  let \u6700\u7EC8\u7ED3\u679C = void 0;
45
45
  try {
46
46
  await log.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
47
- 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);
47
+ 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\u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
48
48
  await log.debug("\u63A5\u53E3\u5B9E\u73B0\u6267\u884C\u5B8C\u6BD5");
49
49
  \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => ({ ...\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...a }));
50
50
  return \u6700\u7EC8\u7ED3\u679C;
51
51
  } finally {
52
52
  if (\u6E05\u7406\u51FD\u6570 !== void 0) {
53
53
  let \u4E0A\u5C42\u6DF7\u5408\u7ED3\u679C = \u6700\u7EC8\u7ED3\u679C !== void 0 && \u6700\u7EC8\u7ED3\u679C.isRight() === true ? \u6700\u7EC8\u7ED3\u679C.assertRight().getRight() : \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570;
54
- await \u6E05\u7406\u51FD\u6570(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4E0A\u5C42\u6DF7\u5408\u7ED3\u679C, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570);
54
+ await \u6E05\u7406\u51FD\u6570(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4E0A\u5C42\u6DF7\u5408\u7ED3\u679C, \u4F20\u5165\u7684\u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
55
55
  }
56
56
  }
57
57
  }
@@ -1,9 +1,9 @@
1
- import {
2
- Global
3
- } from "./chunk-OUDYK6TE.js";
4
1
  import {
5
2
  递归截断字符串
6
3
  } from "./chunk-ZIVQ3WZA.js";
4
+ import {
5
+ Global
6
+ } from "./chunk-OUDYK6TE.js";
7
7
 
8
8
  // src/server/server.ts
9
9
  import express from "express";
@@ -12,7 +12,8 @@ import { networkInterfaces } from "os";
12
12
  import short from "short-uuid";
13
13
  import { WebSocketServer } from "ws";
14
14
  var \u670D\u52A1\u5668 = class {
15
- log;
15
+ \u7CFB\u7EDFlog = Global.getItem("log");
16
+ \u63A5\u53E3log;
16
17
  \u63A5\u53E3\u4EEC;
17
18
  \u7AEF\u53E3;
18
19
  \u9759\u6001\u8D44\u6E90\u8DEF\u5F84;
@@ -22,13 +23,13 @@ var \u670D\u52A1\u5668 = class {
22
23
  this.\u7AEF\u53E3 = options.\u7AEF\u53E3;
23
24
  this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 = options.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84;
24
25
  this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84 = options.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84;
25
- this.log = options.log !== void 0 ? Promise.resolve(options.log) : Global.getItem("log");
26
+ this.\u63A5\u53E3log = options.log !== void 0 ? Promise.resolve(options.log) : Global.getItem("log");
26
27
  }
27
28
  async run() {
28
- let log = (await this.log).extend("\u670D\u52A1\u5668");
29
29
  let app = express();
30
+ let \u7CFB\u7EDFlog = await this.\u7CFB\u7EDFlog;
30
31
  if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
31
- await log.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
32
+ await \u7CFB\u7EDFlog.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
32
33
  app.use(express.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
33
34
  }
34
35
  app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
@@ -38,17 +39,17 @@ var \u670D\u52A1\u5668 = class {
38
39
  }
39
40
  async \u5904\u7406\u8BF7\u6C42(req, res) {
40
41
  let \u8BF7\u6C42id = short().new();
41
- let \u4E3Blog = (await this.log).extend(\u8BF7\u6C42id);
42
- let log = \u4E3Blog.extend("\u63A7\u5236\u5668");
42
+ let \u7CFB\u7EDFlog = (await this.\u7CFB\u7EDFlog).extend(\u8BF7\u6C42id);
43
+ let \u63A5\u53E3log = (await this.\u63A5\u53E3log).extend(\u8BF7\u6C42id);
43
44
  let \u5F00\u59CB\u65F6\u95F4 = Date.now();
44
45
  try {
45
46
  let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
46
47
  \u8BF7\u6C42\u8DEF\u5F84 = decodeURIComponent(\u8BF7\u6C42\u8DEF\u5F84);
47
48
  let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
48
- await log.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
49
+ await \u7CFB\u7EDFlog.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
49
50
  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;
50
51
  if (\u76EE\u6807\u63A5\u53E3 !== null) {
51
- await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, { log: \u4E3Blog });
52
+ await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u63A5\u53E3log, \u7CFB\u7EDFlog);
52
53
  return;
53
54
  }
54
55
  if (this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84 !== void 0 && \u8BF7\u6C42\u65B9\u6CD5 === "get") {
@@ -57,31 +58,30 @@ var \u670D\u52A1\u5668 = class {
57
58
  res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
58
59
  return;
59
60
  } catch (e) {
60
- await log.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
61
+ await \u7CFB\u7EDFlog.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
61
62
  }
62
63
  }
63
- await log.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
64
+ await \u7CFB\u7EDFlog.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
64
65
  res.status(404).end();
65
66
  } catch (error) {
66
- await log.error(error);
67
+ await \u7CFB\u7EDFlog.error(error);
67
68
  res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
68
69
  } finally {
69
70
  let \u8017\u65F6ms = Date.now() - \u5F00\u59CB\u65F6\u95F4;
70
- await \u4E3Blog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
71
+ await \u7CFB\u7EDFlog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
71
72
  }
72
73
  }
73
- async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
74
- let log = \u8BF7\u6C42\u9644\u52A0\u53C2\u6570.log.extend("\u5904\u7406\u63A5\u53E3\u903B\u8F91");
74
+ async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u63A5\u53E3log, \u7CFB\u7EDFlog) {
75
75
  let \u63A5\u53E3\u903B\u8F91 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u903B\u8F91();
76
76
  let \u7ED3\u679C\u8F6C\u6362\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8F6C\u6362\u5668();
77
77
  let \u7ED3\u679C\u8FD4\u56DE\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8FD4\u56DE\u5668();
78
78
  let \u603B\u5F00\u59CB = Date.now();
79
79
  let \u5F00\u59CB = Date.now();
80
- await log.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
81
- let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
82
- let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u63D2\u4EF6\u7ED3\u679C, {}, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
80
+ await \u7CFB\u7EDFlog.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
81
+ let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, { log: \u7CFB\u7EDFlog });
82
+ let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u63D2\u4EF6\u7ED3\u679C, {}, { log: \u63A5\u53E3log });
83
83
  let \u63A5\u53E3\u8017\u65F6 = Date.now() - \u5F00\u59CB;
84
- await log.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
84
+ await \u7CFB\u7EDFlog.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
85
85
  \u5F00\u59CB = Date.now();
86
86
  let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
87
87
  let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
@@ -93,61 +93,59 @@ var \u670D\u52A1\u5668 = class {
93
93
  \u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
94
94
  } else {
95
95
  let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
96
- await log.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
97
- await log.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
98
- await log.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
96
+ await \u7CFB\u7EDFlog.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
97
+ await \u7CFB\u7EDFlog.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
98
+ await \u7CFB\u7EDFlog.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
99
99
  throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
100
100
  }
101
101
  let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
102
- await log.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
103
- await log.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
102
+ await \u7CFB\u7EDFlog.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
103
+ await \u7CFB\u7EDFlog.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
104
104
  \u5F00\u59CB = Date.now();
105
105
  await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
106
106
  let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
107
- await log.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
107
+ await \u7CFB\u7EDFlog.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
108
108
  let \u603B\u8017\u65F6 = Date.now() - \u603B\u5F00\u59CB;
109
- await log.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
109
+ await \u7CFB\u7EDFlog.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
110
110
  }
111
111
  async \u521D\u59CB\u5316WebSocket(server) {
112
112
  let wss = new WebSocketServer({ server });
113
- let logBase = await this.log;
113
+ let \u7CFB\u7EDFlog = await this.\u7CFB\u7EDFlog;
114
114
  wss.on("listening", async () => {
115
- let log = logBase;
116
- await log.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
115
+ await \u7CFB\u7EDFlog.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
117
116
  });
118
117
  wss.on("error", async (err) => {
119
- let log = logBase;
120
- await log.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
118
+ await \u7CFB\u7EDFlog.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
121
119
  });
122
120
  wss.on("connection", async (ws, req) => {
123
- let log = logBase.extend(short().new()).extend("WebSocket");
124
- await log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
121
+ let \u63A5\u53E3log = \u7CFB\u7EDFlog.extend(short().new());
122
+ await \u63A5\u53E3log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
125
123
  let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
126
124
  if (\u5BA2\u6237\u7AEFid === null) {
127
- await log.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
128
- return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
125
+ await \u63A5\u53E3log.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
126
+ return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u63A5\u53E3log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
129
127
  }
130
- await log.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
128
+ await \u63A5\u53E3log.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
131
129
  let WebSocket\u7BA1\u7406\u5668 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
132
130
  let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u5668.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
133
131
  if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
134
- await log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
135
- return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
132
+ await \u63A5\u53E3log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
133
+ return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u63A5\u53E3log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
136
134
  }
137
135
  WebSocket\u7BA1\u7406\u5668.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
138
- await log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
136
+ await \u63A5\u53E3log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
139
137
  ws.on("close", async () => {
140
- await log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
138
+ await \u63A5\u53E3log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
141
139
  WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
142
140
  });
143
141
  ws.on("error", async (err) => {
144
- await log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
142
+ await \u63A5\u53E3log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
145
143
  WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
146
144
  });
147
145
  });
148
146
  }
149
- async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, code, reason) {
150
- await log.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
147
+ async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u63A5\u53E3log, code, reason) {
148
+ await \u63A5\u53E3log.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
151
149
  ws.close(code, reason);
152
150
  }
153
151
  \u83B7\u53D6\u672C\u5730\u5730\u5740() {
@@ -1,15 +1,14 @@
1
- import {
2
- 插件
3
- } from "./chunk-43GZE5YL.js";
4
1
  import {
5
2
  Global
6
3
  } from "./chunk-OUDYK6TE.js";
4
+ import {
5
+ 插件
6
+ } from "./chunk-43GZE5YL.js";
7
7
 
8
8
  // src/plugin/extend/web-socket.ts
9
9
  import { WebSocket } from "ws";
10
10
  import { z } from "zod";
11
11
  var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
12
- log = Global.getItem("log");
13
12
  constructor(\u4FE1\u606F\u63CF\u8FF0) {
14
13
  super(
15
14
  z.object({
@@ -1,13 +1,9 @@
1
1
  import {
2
2
  插件
3
3
  } from "./chunk-43GZE5YL.js";
4
- import {
5
- Global
6
- } from "./chunk-OUDYK6TE.js";
7
4
 
8
5
  // src/plugin/extend/custom-data.ts
9
6
  var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
10
- log = Global.getItem("log");
11
7
  constructor(t, data) {
12
8
  super(t, async (_res, _req, \u9644\u52A0\u53C2\u6570) => {
13
9
  let log = \u9644\u52A0\u53C2\u6570.log.extend("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6");
@@ -1,15 +1,11 @@
1
1
  import {
2
2
  插件
3
3
  } from "./chunk-43GZE5YL.js";
4
- import {
5
- Global
6
- } from "./chunk-OUDYK6TE.js";
7
4
 
8
5
  // src/plugin/extend/urlencoded.ts
9
6
  import express from "express";
10
7
  import { format } from "util";
11
8
  var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
12
- log = Global.getItem("log");
13
9
  constructor(t, opt) {
14
10
  super(t, async (req, res, \u9644\u52A0\u53C2\u6570) => {
15
11
  let log = \u9644\u52A0\u53C2\u6570.log.extend("JSON\u89E3\u6790\u63D2\u4EF6");
@@ -1,5 +1,5 @@
1
1
  export { 构造元组, 构造对象 } from './help/help.js';
2
- export { 任 as 任意接口, x as 任意接口结果转换器, n as 任意接口逻辑, z as 任意插件, 兼 as 兼容空对象, B as 取插件内部ts类型, 取 as 取插件内部类型, 可 as 可调用接口逻辑, 合 as 合并插件结果, y as 常用延时直接形式转换器, 常 as 常用形式转换器, b as 接口, a as 接口方法类型, w as 接口结果转换器, 接 as 接口路径类型, m as 接口逻辑, l as 接口逻辑Base, j as 接口逻辑正确类型, i as 接口逻辑错误类型, k as 接口逻辑附加参数类型, 插 as 插件, A 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-BCiBG0At.js';
2
+ export { 任 as 任意接口, x as 任意接口结果转换器, n as 任意接口逻辑, z as 任意插件, 兼 as 兼容空对象, B as 取插件内部ts类型, 取 as 取插件内部类型, 可 as 可调用接口逻辑, 合 as 合并插件结果, y as 常用延时直接形式转换器, 常 as 常用形式转换器, b as 接口, a as 接口方法类型, w as 接口结果转换器, 接 as 接口路径类型, m as 接口逻辑, l as 接口逻辑Base, j as 接口逻辑正确类型, i as 接口逻辑错误类型, k as 接口逻辑附加参数类型, 插 as 插件, A 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-CKPWT5C9.js';
3
3
  export { 任意接口结果返回器, 常用返回器, 接口结果返回器, 自定义返回器 } from './interface/interface-retuen.js';
4
4
  export { 接口测试 } from './interface/interface-test.js';
5
5
  export { 自定义数据插件 } from './plugin/extend/custom-data.js';