@lsby/net-core 0.7.11-beta.1 → 0.7.11-beta.3
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.
- package/dist/bin/gen-api-list/bin.cjs +5 -10
- package/dist/bin/gen-api-list/index.cjs +5 -10
- package/dist/bin/gen-api-type/bin.cjs +4 -8
- package/dist/bin/gen-api-type/index.cjs +4 -8
- package/dist/bin/gen-test/bin.cjs +6 -12
- package/dist/bin/gen-test/index.cjs +6 -12
- package/dist/cjs/action/action.bak.cjs +6 -12
- package/dist/cjs/bin/gen-api-list/bin.cjs +5 -10
- package/dist/cjs/bin/gen-api-list/index.cjs +5 -10
- package/dist/cjs/bin/gen-api-type/bin.cjs +4 -8
- package/dist/cjs/bin/gen-api-type/index.cjs +4 -8
- package/dist/cjs/bin/gen-test/bin.cjs +6 -12
- package/dist/cjs/bin/gen-test/index.cjs +6 -12
- package/dist/cjs/global/global.cjs +8 -10
- package/dist/cjs/global/global.d.cts +15 -4
- package/dist/cjs/help/interior.cjs +4 -8
- package/dist/cjs/index.cjs +74 -83
- package/dist/cjs/interface/interface-logic.cjs +1 -2
- package/dist/cjs/plugin/extend/custom-data.cjs +6 -10
- package/dist/cjs/plugin/extend/json.cjs +4 -8
- package/dist/cjs/plugin/extend/query.cjs +4 -8
- package/dist/cjs/plugin/extend/urlencoded.cjs +6 -10
- package/dist/cjs/plugin/extend/web-socket.cjs +16 -20
- package/dist/cjs/server/server.cjs +39 -47
- package/dist/esm/action/action.bak.js +6 -12
- package/dist/esm/bin/gen-api-list/bin.js +2 -2
- package/dist/esm/bin/gen-api-list/index.js +1 -1
- package/dist/esm/bin/gen-api-type/bin.js +2 -2
- package/dist/esm/bin/gen-api-type/index.js +1 -1
- package/dist/esm/bin/gen-test/bin.js +2 -2
- package/dist/esm/bin/gen-test/index.js +1 -1
- package/dist/esm/{chunk-47T4ZLNQ.js → chunk-4BFNDHRC.js} +1 -1
- package/dist/esm/{chunk-DV3NLRIF.js → chunk-AFWSZAXR.js} +9 -15
- package/dist/esm/{chunk-2JQ7AEO4.js → chunk-AY6KWNWX.js} +2 -2
- package/dist/esm/{chunk-7YSXFQXB.js → chunk-BFL3HOQE.js} +7 -9
- package/dist/esm/{chunk-DWJEBJWU.js → chunk-BHMLNO54.js} +7 -11
- package/dist/esm/{chunk-2I2MJFB2.js → chunk-GMYXAJS3.js} +2 -2
- package/dist/esm/{chunk-DI6KYJ65.js → chunk-LZKS5TUK.js} +1 -2
- package/dist/esm/{chunk-BBDALATZ.js → chunk-RT54DDSM.js} +6 -6
- package/dist/esm/{chunk-VZH2ETK3.js → chunk-TD5W3AAH.js} +1 -1
- package/dist/esm/{chunk-Y2ZVCJPE.js → chunk-UKAZDGUR.js} +8 -13
- package/dist/esm/{chunk-TN3QCUBD.js → chunk-VFOG5LBT.js} +1 -1
- package/dist/esm/{chunk-O2ZDZKFT.js → chunk-YITJBWMM.js} +2 -2
- package/dist/esm/{chunk-NMG5C5AS.js → chunk-ZIVQ3WZA.js} +4 -8
- package/dist/esm/global/global.d.ts +15 -4
- package/dist/esm/global/global.js +5 -3
- package/dist/esm/help/interior.js +1 -1
- package/dist/esm/index.js +19 -19
- package/dist/esm/interface/interface-logic.js +1 -1
- package/dist/esm/plugin/extend/chinese-path.js +1 -1
- package/dist/esm/plugin/extend/custom-data.js +2 -2
- package/dist/esm/plugin/extend/json.js +2 -2
- package/dist/esm/plugin/extend/query.js +2 -2
- package/dist/esm/plugin/extend/urlencoded.js +2 -2
- package/dist/esm/plugin/extend/web-socket.js +2 -2
- package/dist/esm/server/server.js +3 -3
- package/dist/esm/wrapper/common-wrapper.js +2 -2
- package/dist/esm/wrapper/deferred-result-wrapper.js +2 -2
- package/package.json +2 -2
- package/dist/cjs/global/web-socket-management.cjs +0 -71
- package/dist/cjs/global/web-socket-management.d.cts +0 -16
- package/dist/esm/global/web-socket-management.d.ts +0 -16
- package/dist/esm/global/web-socket-management.js +0 -6
- package/dist/esm/{chunk-WYJFP5V5.js → chunk-FEURUNOT.js} +3 -3
- package/dist/esm/{chunk-FHU5AZWT.js → chunk-JLHGWUH6.js} +3 -3
|
@@ -1,8 +1,19 @@
|
|
|
1
1
|
import { GlobalService, GlobalItem } from '@lsby/ts-global';
|
|
2
2
|
import { Log } from '@lsby/ts-log';
|
|
3
|
-
import { WebSocket
|
|
4
|
-
import 'ws';
|
|
3
|
+
import { WebSocket } from 'ws';
|
|
5
4
|
|
|
6
|
-
|
|
5
|
+
type id = string;
|
|
6
|
+
declare class WebSocket管理器 {
|
|
7
|
+
private 连接表;
|
|
8
|
+
private log;
|
|
9
|
+
private 清理函数表;
|
|
10
|
+
constructor(连接表: Record<id, WebSocket | null>);
|
|
11
|
+
增加连接(id: id, ws句柄: WebSocket): void;
|
|
12
|
+
查询连接存在(id: string): boolean;
|
|
13
|
+
设置清理函数(id: string, 清理函数: () => Promise<void>): Promise<void>;
|
|
14
|
+
获得句柄(id: id): Promise<WebSocket | null>;
|
|
15
|
+
删除连接(id: string): void;
|
|
16
|
+
}
|
|
17
|
+
declare let Global: GlobalService<[GlobalItem<"log", Log>, GlobalItem<"WebSocket管理器", WebSocket管理器>]>;
|
|
7
18
|
|
|
8
|
-
export { Global };
|
|
19
|
+
export { Global, WebSocket管理器 };
|
|
@@ -26,20 +26,16 @@ __export(interior_exports, {
|
|
|
26
26
|
module.exports = __toCommonJS(interior_exports);
|
|
27
27
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
28
28
|
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
29
|
-
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
30
|
-
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
29
|
+
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
31
30
|
return \u5185\u5BB9;
|
|
32
31
|
}
|
|
33
32
|
function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
34
|
-
if (typeof \u6570\u636E === "string")
|
|
35
|
-
|
|
36
|
-
if (Array.isArray(\u6570\u636E))
|
|
37
|
-
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
33
|
+
if (typeof \u6570\u636E === "string") return \u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E);
|
|
34
|
+
if (Array.isArray(\u6570\u636E)) return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
38
35
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
39
36
|
let \u65B0\u6570\u636E = {};
|
|
40
37
|
for (let key in \u6570\u636E) {
|
|
41
|
-
if (\u6570\u636E.hasOwnProperty(key) === true)
|
|
42
|
-
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
38
|
+
if (\u6570\u636E.hasOwnProperty(key) === true) \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
43
39
|
}
|
|
44
40
|
return \u65B0\u6570\u636E;
|
|
45
41
|
}
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
28
28
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
29
|
|
|
30
30
|
// src/index.ts
|
|
31
|
-
var
|
|
32
|
-
__export(
|
|
31
|
+
var index_exports = {};
|
|
32
|
+
__export(index_exports, {
|
|
33
33
|
EXPORT_TYPE: () => EXPORT_TYPE,
|
|
34
34
|
GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6: () => GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
|
|
35
35
|
JSON\u89E3\u6790\u63D2\u4EF6: () => JSON\u89E3\u6790\u63D2\u4EF6,
|
|
@@ -53,7 +53,7 @@ __export(src_exports, {
|
|
|
53
53
|
\u8868\u5355\u89E3\u6790\u63D2\u4EF6: () => \u8868\u5355\u89E3\u6790\u63D2\u4EF6,
|
|
54
54
|
\u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6: () => \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6
|
|
55
55
|
});
|
|
56
|
-
module.exports = __toCommonJS(
|
|
56
|
+
module.exports = __toCommonJS(index_exports);
|
|
57
57
|
|
|
58
58
|
// src/help/help.ts
|
|
59
59
|
function \u6784\u9020\u5143\u7EC4(args) {
|
|
@@ -118,9 +118,9 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
118
118
|
return this.\u5B8C\u6574\u6784\u9020(\u63D2\u4EF6\u4EEC, \u5B9E\u73B0, null, null);
|
|
119
119
|
}
|
|
120
120
|
async \u8FD0\u884C(req, res, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570) {
|
|
121
|
-
let
|
|
121
|
+
let log2 = \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570.log.extend("\u63A5\u53E3\u903B\u8F91");
|
|
122
122
|
let \u63D2\u4EF6\u4EEC = this.\u83B7\u5F97\u63D2\u4EF6\u4EEC();
|
|
123
|
-
await
|
|
123
|
+
await log2.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63D2\u4EF6\u4EEC.length);
|
|
124
124
|
let \u6240\u6709\u63D2\u4EF6\u7ED3\u679C = [];
|
|
125
125
|
for (let \u63D2\u4EF62 of \u63D2\u4EF6\u4EEC) {
|
|
126
126
|
let \u63D2\u4EF6\u672C\u4F53 = await \u63D2\u4EF62.run();
|
|
@@ -128,10 +128,10 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
128
128
|
\u6240\u6709\u63D2\u4EF6\u7ED3\u679C.push(\u63D2\u4EF6\u8FD4\u56DE);
|
|
129
129
|
}
|
|
130
130
|
let \u5408\u5E76\u63D2\u4EF6\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => ({ ...s, ...a }), {});
|
|
131
|
-
await
|
|
132
|
-
await
|
|
131
|
+
await log2.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
|
|
132
|
+
await log2.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
|
|
133
133
|
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);
|
|
134
|
-
await
|
|
134
|
+
await log2.debug("\u63A5\u53E3\u5B9E\u73B0\u6267\u884C\u5B8C\u6BD5");
|
|
135
135
|
return \u5B9E\u73B0\u7ED3\u679C.map((a) => ({ ...\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...a }));
|
|
136
136
|
}
|
|
137
137
|
\u6DF7\u5408(\u8F93\u5165) {
|
|
@@ -139,8 +139,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
139
139
|
[...this.\u83B7\u5F97\u63D2\u4EF6\u4EEC(), ...\u8F93\u5165.\u83B7\u5F97\u63D2\u4EF6\u4EEC()],
|
|
140
140
|
async (\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) => {
|
|
141
141
|
let \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C = await this.\u5B9E\u73B0(\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
142
|
-
if (\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.isLeft())
|
|
143
|
-
return \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C;
|
|
142
|
+
if (\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.isLeft()) return \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C;
|
|
144
143
|
let \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684 = { ...\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.assertRight().getRight() };
|
|
145
144
|
let \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C = await \u8F93\u5165.\u5B9E\u73B0(\u53C2\u6570, \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
146
145
|
let \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C = \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C.map((a) => ({ ...\u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, ...a }));
|
|
@@ -245,13 +244,12 @@ var \u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6 = class extends \u63D2\u4EF
|
|
|
245
244
|
// src/global/global.ts
|
|
246
245
|
var import_ts_global = require("@lsby/ts-global");
|
|
247
246
|
var import_ts_log = require("@lsby/ts-log");
|
|
248
|
-
|
|
249
|
-
// src/global/web-socket-management.ts
|
|
247
|
+
var log = new import_ts_log.Log("@lsby:net-core");
|
|
250
248
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
251
249
|
constructor(\u8FDE\u63A5\u8868) {
|
|
252
250
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
253
251
|
}
|
|
254
|
-
log =
|
|
252
|
+
log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
255
253
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
256
254
|
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
257
255
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
@@ -260,8 +258,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
260
258
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
261
259
|
}
|
|
262
260
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
263
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
264
|
-
return;
|
|
261
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
265
262
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
266
263
|
}
|
|
267
264
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
@@ -279,10 +276,8 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
279
276
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
280
277
|
}
|
|
281
278
|
};
|
|
282
|
-
|
|
283
|
-
// src/global/global.ts
|
|
284
279
|
var Global = new import_ts_global.GlobalService([
|
|
285
|
-
new import_ts_global.GlobalItem("log",
|
|
280
|
+
new import_ts_global.GlobalItem("log", log),
|
|
286
281
|
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
287
282
|
]);
|
|
288
283
|
|
|
@@ -291,8 +286,8 @@ var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
291
286
|
log = Global.getItem("log");
|
|
292
287
|
constructor(t, data) {
|
|
293
288
|
super(t, async (_res, _req, \u9644\u52A0\u53C2\u6570) => {
|
|
294
|
-
let
|
|
295
|
-
await
|
|
289
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6");
|
|
290
|
+
await log2.debug("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6\u8FD0\u884C, \u7ED3\u679C: %o", data);
|
|
296
291
|
return data;
|
|
297
292
|
});
|
|
298
293
|
}
|
|
@@ -305,20 +300,16 @@ var import_node_util = require("util");
|
|
|
305
300
|
// src/help/interior.ts
|
|
306
301
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
307
302
|
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
308
|
-
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
309
|
-
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
303
|
+
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
310
304
|
return \u5185\u5BB9;
|
|
311
305
|
}
|
|
312
306
|
function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
313
|
-
if (typeof \u6570\u636E === "string")
|
|
314
|
-
|
|
315
|
-
if (Array.isArray(\u6570\u636E))
|
|
316
|
-
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
307
|
+
if (typeof \u6570\u636E === "string") return \u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E);
|
|
308
|
+
if (Array.isArray(\u6570\u636E)) return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
317
309
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
318
310
|
let \u65B0\u6570\u636E = {};
|
|
319
311
|
for (let key in \u6570\u636E) {
|
|
320
|
-
if (\u6570\u636E.hasOwnProperty(key) === true)
|
|
321
|
-
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
312
|
+
if (\u6570\u636E.hasOwnProperty(key) === true) \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
322
313
|
}
|
|
323
314
|
return \u65B0\u6570\u636E;
|
|
324
315
|
}
|
|
@@ -331,19 +322,19 @@ var JSON\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
331
322
|
[\u70D9\u5370] = ["JSON\u89E3\u6790\u63D2\u4EF6"];
|
|
332
323
|
constructor(t, opt) {
|
|
333
324
|
super(t, async (req, res, \u9644\u52A0\u53C2\u6570) => {
|
|
334
|
-
let
|
|
325
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("JSON\u89E3\u6790\u63D2\u4EF6");
|
|
335
326
|
await new Promise(
|
|
336
327
|
(pRes, _rej) => import_express.default.json(opt)(req, res, () => {
|
|
337
328
|
pRes(null);
|
|
338
329
|
})
|
|
339
330
|
);
|
|
340
|
-
await
|
|
331
|
+
await log2.debug("\u51C6\u5907\u89E3\u6790 JSON\uFF1A%o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.body)));
|
|
341
332
|
let parseResult = t.safeParse(req.body);
|
|
342
333
|
if (parseResult.success === false) {
|
|
343
|
-
await
|
|
334
|
+
await log2.error("\u89E3\u6790 JSON \u5931\u8D25\uFF1A%o", parseResult.error);
|
|
344
335
|
throw new Error((0, import_node_util.format)("\u89E3\u6790 JSON \u5931\u8D25: %o", parseResult.error));
|
|
345
336
|
}
|
|
346
|
-
await
|
|
337
|
+
await log2.debug("\u6210\u529F\u89E3\u6790 JSON");
|
|
347
338
|
return parseResult.data;
|
|
348
339
|
});
|
|
349
340
|
}
|
|
@@ -355,8 +346,8 @@ var zod\u7C7B\u578B\u8868\u793A2 = import_zod2.z.object({});
|
|
|
355
346
|
var \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
356
347
|
constructor() {
|
|
357
348
|
super(zod\u7C7B\u578B\u8868\u793A2, async (req, res, \u9644\u52A0\u53C2\u6570) => {
|
|
358
|
-
let
|
|
359
|
-
await
|
|
349
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("\u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6");
|
|
350
|
+
await log2.debug(req.headers);
|
|
360
351
|
return {};
|
|
361
352
|
});
|
|
362
353
|
}
|
|
@@ -369,14 +360,14 @@ var GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
369
360
|
[\u70D9\u53702] = ["GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6"];
|
|
370
361
|
constructor(t) {
|
|
371
362
|
super(t, async (req, _res, \u9644\u52A0\u53C2\u6570) => {
|
|
372
|
-
let
|
|
373
|
-
await
|
|
363
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6");
|
|
364
|
+
await log2.debug("\u51C6\u5907\u89E3\u6790 GET \u53C2\u6570\uFF1A%o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.query)));
|
|
374
365
|
let parseResult = t.safeParse(req.query);
|
|
375
366
|
if (parseResult.success === false) {
|
|
376
|
-
await
|
|
367
|
+
await log2.error("\u89E3\u6790 GET \u53C2\u6570\u5931\u8D25\uFF1A%o", parseResult.error);
|
|
377
368
|
throw new Error((0, import_node_util2.format)("\u89E3\u6790 GET \u53C2\u6570\u5931\u8D25: %o", parseResult.error));
|
|
378
369
|
}
|
|
379
|
-
await
|
|
370
|
+
await log2.debug("\u6210\u529F\u89E3\u6790 GET \u53C2\u6570");
|
|
380
371
|
return parseResult.data;
|
|
381
372
|
});
|
|
382
373
|
}
|
|
@@ -404,7 +395,7 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
404
395
|
log = Global.getItem("log");
|
|
405
396
|
constructor(t, opt) {
|
|
406
397
|
super(t, async (req, res, \u9644\u52A0\u53C2\u6570) => {
|
|
407
|
-
let
|
|
398
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("JSON\u89E3\u6790\u63D2\u4EF6");
|
|
408
399
|
await new Promise(
|
|
409
400
|
(pRes, _rej) => import_express2.default.urlencoded({ extended: true, ...opt })(req, res, () => {
|
|
410
401
|
pRes(null);
|
|
@@ -412,7 +403,7 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
412
403
|
);
|
|
413
404
|
let parseResult = t.safeParse(req.body);
|
|
414
405
|
if (parseResult.success === false) {
|
|
415
|
-
await
|
|
406
|
+
await log2.error("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error);
|
|
416
407
|
throw new Error((0, import_node_util3.format)("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error));
|
|
417
408
|
}
|
|
418
409
|
return parseResult.data;
|
|
@@ -435,49 +426,49 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
435
426
|
}).or(import_zod4.z.null())
|
|
436
427
|
}),
|
|
437
428
|
async (req, _res, \u9644\u52A0\u53C2\u6570) => {
|
|
438
|
-
let
|
|
429
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("webSocket\u63D2\u4EF6");
|
|
439
430
|
let WebSocket\u7BA1\u7406\u56682 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
|
|
440
431
|
let ws\u53E5\u67C4 = null;
|
|
441
432
|
let wsId = req.headers["ws-client-id"];
|
|
442
|
-
await
|
|
433
|
+
await log2.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
443
434
|
if (typeof wsId !== "string") {
|
|
444
|
-
await
|
|
435
|
+
await log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket Id");
|
|
445
436
|
return { ws\u64CD\u4F5C: null };
|
|
446
437
|
}
|
|
447
|
-
await
|
|
438
|
+
await log2.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
|
|
448
439
|
return {
|
|
449
440
|
ws\u64CD\u4F5C: {
|
|
450
441
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
451
442
|
if (ws\u53E5\u67C4 === null) {
|
|
452
|
-
await
|
|
443
|
+
await log2.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
|
|
453
444
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
454
445
|
}
|
|
455
446
|
if (ws\u53E5\u67C4 === null) {
|
|
456
|
-
await
|
|
447
|
+
await log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
|
|
457
448
|
return;
|
|
458
449
|
}
|
|
459
450
|
if (ws\u53E5\u67C4.readyState !== import_ws.WebSocket.OPEN) {
|
|
460
|
-
await
|
|
451
|
+
await log2.warn("WebSocket \u672A\u6253\u5F00\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F", { wsId });
|
|
461
452
|
return;
|
|
462
453
|
}
|
|
463
|
-
await
|
|
454
|
+
await log2.debug("\u53D1\u9001 WebSocket \u4FE1\u606F", { \u4FE1\u606F });
|
|
464
455
|
await new Promise((resolve, reject) => {
|
|
465
456
|
ws\u53E5\u67C4?.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
466
457
|
if (err !== void 0 && err !== null) {
|
|
467
|
-
|
|
458
|
+
log2.warnSync("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err });
|
|
468
459
|
return reject(err);
|
|
469
460
|
}
|
|
470
|
-
|
|
461
|
+
log2.debugSync("WebSocket \u4FE1\u606F\u53D1\u9001\u6210\u529F");
|
|
471
462
|
resolve();
|
|
472
463
|
});
|
|
473
464
|
});
|
|
474
465
|
},
|
|
475
466
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
476
|
-
await
|
|
467
|
+
await log2.debug("\u5173\u95ED WebSocket \u8FDE\u63A5", { wsId });
|
|
477
468
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(wsId);
|
|
478
469
|
},
|
|
479
470
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u6E05\u7406\u51FD\u6570) {
|
|
480
|
-
await
|
|
471
|
+
await log2.debug("\u8BBE\u7F6E WebSocket \u6E05\u7406\u51FD\u6570", { wsId });
|
|
481
472
|
await WebSocket\u7BA1\u7406\u56682.\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(wsId, \u6E05\u7406\u51FD\u6570);
|
|
482
473
|
}
|
|
483
474
|
}
|
|
@@ -502,10 +493,10 @@ var \u670D\u52A1\u5668 = class {
|
|
|
502
493
|
}
|
|
503
494
|
log = Global.getItem("log");
|
|
504
495
|
async run() {
|
|
505
|
-
let
|
|
496
|
+
let log2 = (await this.log).extend("\u670D\u52A1\u5668");
|
|
506
497
|
let app = (0, import_express3.default)();
|
|
507
498
|
if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
|
|
508
|
-
await
|
|
499
|
+
await log2.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
|
|
509
500
|
app.use(import_express3.default.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
|
|
510
501
|
}
|
|
511
502
|
app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
|
|
@@ -516,11 +507,11 @@ var \u670D\u52A1\u5668 = class {
|
|
|
516
507
|
async \u5904\u7406\u8BF7\u6C42(req, res) {
|
|
517
508
|
let \u8BF7\u6C42id = (0, import_short_uuid.default)().new();
|
|
518
509
|
let \u4E3Blog = (await this.log).extend(\u8BF7\u6C42id);
|
|
519
|
-
let
|
|
510
|
+
let log2 = \u4E3Blog.extend("\u63A7\u5236\u5668");
|
|
520
511
|
try {
|
|
521
512
|
let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
|
|
522
513
|
let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
|
|
523
|
-
await
|
|
514
|
+
await log2.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
524
515
|
let \u76EE\u6807\u63A5\u53E3 = this.\u63A5\u53E3\u4EEC.find((\u63A5\u53E32) => \u8BF7\u6C42\u65B9\u6CD5 === \u63A5\u53E32.\u83B7\u5F97\u65B9\u6CD5() && \u8BF7\u6C42\u8DEF\u5F84 === \u63A5\u53E32.\u83B7\u5F97\u8DEF\u5F84()) ?? null;
|
|
525
516
|
if (\u76EE\u6807\u63A5\u53E3 !== null) {
|
|
526
517
|
await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, { log: \u4E3Blog });
|
|
@@ -532,23 +523,23 @@ var \u670D\u52A1\u5668 = class {
|
|
|
532
523
|
res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
|
|
533
524
|
return;
|
|
534
525
|
} catch (e) {
|
|
535
|
-
await
|
|
526
|
+
await log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
|
|
536
527
|
}
|
|
537
528
|
}
|
|
538
|
-
await
|
|
529
|
+
await log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
|
|
539
530
|
res.status(404).end();
|
|
540
531
|
} catch (error) {
|
|
541
|
-
await
|
|
532
|
+
await log2.error(error);
|
|
542
533
|
res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
|
|
543
534
|
}
|
|
544
535
|
}
|
|
545
536
|
async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
|
|
546
|
-
let
|
|
537
|
+
let log2 = \u8BF7\u6C42\u9644\u52A0\u53C2\u6570.log.extend("\u5904\u7406\u63A5\u53E3\u903B\u8F91");
|
|
547
538
|
let \u63A5\u53E3\u903B\u8F912 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u903B\u8F91();
|
|
548
539
|
let \u7ED3\u679C\u8F6C\u6362\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8F6C\u6362\u5668();
|
|
549
|
-
await
|
|
540
|
+
await log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
|
|
550
541
|
let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u8FD0\u884C(req, res, {}, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
551
|
-
await
|
|
542
|
+
await log2.debug("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
552
543
|
let \u6700\u7EC8\u7ED3\u679C;
|
|
553
544
|
let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
|
|
554
545
|
let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
|
|
@@ -558,55 +549,55 @@ var \u670D\u52A1\u5668 = class {
|
|
|
558
549
|
} else if (\u6B63\u786E\u7ED3\u679C.success === true) {
|
|
559
550
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
560
551
|
} else {
|
|
561
|
-
await
|
|
562
|
-
await
|
|
563
|
-
await
|
|
552
|
+
await log2.error("\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C");
|
|
553
|
+
await log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
554
|
+
await log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
564
555
|
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C))}`);
|
|
565
556
|
}
|
|
566
|
-
await
|
|
557
|
+
await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", \u6700\u7EC8\u7ED3\u679C);
|
|
567
558
|
res.send(\u6700\u7EC8\u7ED3\u679C);
|
|
568
|
-
await
|
|
559
|
+
await log2.debug("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
569
560
|
}
|
|
570
561
|
async \u521D\u59CB\u5316WebSocket(server) {
|
|
571
562
|
let wss = new import_ws2.WebSocketServer({ server });
|
|
572
563
|
let logBase = await this.log;
|
|
573
564
|
wss.on("listening", async () => {
|
|
574
|
-
let
|
|
575
|
-
await
|
|
565
|
+
let log2 = logBase;
|
|
566
|
+
await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
|
|
576
567
|
});
|
|
577
568
|
wss.on("error", async (err) => {
|
|
578
|
-
let
|
|
579
|
-
await
|
|
569
|
+
let log2 = logBase;
|
|
570
|
+
await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
|
|
580
571
|
});
|
|
581
572
|
wss.on("connection", async (ws, req) => {
|
|
582
|
-
let
|
|
583
|
-
|
|
573
|
+
let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
574
|
+
log2.debugSync("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
584
575
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
585
576
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
586
|
-
|
|
587
|
-
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws,
|
|
577
|
+
log2.errorSync("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
578
|
+
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
588
579
|
}
|
|
589
|
-
|
|
580
|
+
log2.debugSync("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
590
581
|
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
591
582
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
592
583
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
593
|
-
|
|
594
|
-
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws,
|
|
584
|
+
log2.errorSync("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
585
|
+
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
595
586
|
}
|
|
596
587
|
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
597
|
-
|
|
588
|
+
log2.infoSync("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
598
589
|
ws.on("close", async () => {
|
|
599
|
-
|
|
590
|
+
log2.infoSync("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
600
591
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
601
592
|
});
|
|
602
593
|
ws.on("error", async (err) => {
|
|
603
|
-
|
|
594
|
+
log2.errorSync("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
604
595
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
605
596
|
});
|
|
606
597
|
});
|
|
607
598
|
}
|
|
608
|
-
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws,
|
|
609
|
-
await
|
|
599
|
+
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, code, reason) {
|
|
600
|
+
await log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
|
|
610
601
|
ws.close(code, reason);
|
|
611
602
|
}
|
|
612
603
|
\u83B7\u53D6\u672C\u5730\u5730\u5740() {
|
|
@@ -69,8 +69,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
69
69
|
[...this.\u83B7\u5F97\u63D2\u4EF6\u4EEC(), ...\u8F93\u5165.\u83B7\u5F97\u63D2\u4EF6\u4EEC()],
|
|
70
70
|
async (\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) => {
|
|
71
71
|
let \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C = await this.\u5B9E\u73B0(\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
72
|
-
if (\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.isLeft())
|
|
73
|
-
return \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C;
|
|
72
|
+
if (\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.isLeft()) return \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C;
|
|
74
73
|
let \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684 = { ...\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.assertRight().getRight() };
|
|
75
74
|
let \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C = await \u8F93\u5165.\u5B9E\u73B0(\u53C2\u6570, \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
76
75
|
let \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C = \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C.map((a) => ({ ...\u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, ...a }));
|
|
@@ -27,13 +27,12 @@ module.exports = __toCommonJS(custom_data_exports);
|
|
|
27
27
|
// src/global/global.ts
|
|
28
28
|
var import_ts_global = require("@lsby/ts-global");
|
|
29
29
|
var import_ts_log = require("@lsby/ts-log");
|
|
30
|
-
|
|
31
|
-
// src/global/web-socket-management.ts
|
|
30
|
+
var log = new import_ts_log.Log("@lsby:net-core");
|
|
32
31
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
33
32
|
constructor(\u8FDE\u63A5\u8868) {
|
|
34
33
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
35
34
|
}
|
|
36
|
-
log =
|
|
35
|
+
log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
37
36
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
38
37
|
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
39
38
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
@@ -42,8 +41,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
42
41
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
43
42
|
}
|
|
44
43
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
45
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
46
|
-
return;
|
|
44
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
47
45
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
48
46
|
}
|
|
49
47
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
@@ -61,10 +59,8 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
61
59
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
62
60
|
}
|
|
63
61
|
};
|
|
64
|
-
|
|
65
|
-
// src/global/global.ts
|
|
66
62
|
var Global = new import_ts_global.GlobalService([
|
|
67
|
-
new import_ts_global.GlobalItem("log",
|
|
63
|
+
new import_ts_global.GlobalItem("log", log),
|
|
68
64
|
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
69
65
|
]);
|
|
70
66
|
|
|
@@ -87,8 +83,8 @@ var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
87
83
|
log = Global.getItem("log");
|
|
88
84
|
constructor(t, data) {
|
|
89
85
|
super(t, async (_res, _req, \u9644\u52A0\u53C2\u6570) => {
|
|
90
|
-
let
|
|
91
|
-
await
|
|
86
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6");
|
|
87
|
+
await log2.debug("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6\u8FD0\u884C, \u7ED3\u679C: %o", data);
|
|
92
88
|
return data;
|
|
93
89
|
});
|
|
94
90
|
}
|
|
@@ -39,20 +39,16 @@ var import_node_util = require("util");
|
|
|
39
39
|
// src/help/interior.ts
|
|
40
40
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
41
41
|
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
42
|
-
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
43
|
-
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
42
|
+
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
44
43
|
return \u5185\u5BB9;
|
|
45
44
|
}
|
|
46
45
|
function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
47
|
-
if (typeof \u6570\u636E === "string")
|
|
48
|
-
|
|
49
|
-
if (Array.isArray(\u6570\u636E))
|
|
50
|
-
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
46
|
+
if (typeof \u6570\u636E === "string") return \u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E);
|
|
47
|
+
if (Array.isArray(\u6570\u636E)) return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
51
48
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
52
49
|
let \u65B0\u6570\u636E = {};
|
|
53
50
|
for (let key in \u6570\u636E) {
|
|
54
|
-
if (\u6570\u636E.hasOwnProperty(key) === true)
|
|
55
|
-
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
51
|
+
if (\u6570\u636E.hasOwnProperty(key) === true) \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
56
52
|
}
|
|
57
53
|
return \u65B0\u6570\u636E;
|
|
58
54
|
}
|
|
@@ -28,20 +28,16 @@ var import_node_util = require("util");
|
|
|
28
28
|
// src/help/interior.ts
|
|
29
29
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
30
30
|
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
31
|
-
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
32
|
-
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
31
|
+
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
33
32
|
return \u5185\u5BB9;
|
|
34
33
|
}
|
|
35
34
|
function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
36
|
-
if (typeof \u6570\u636E === "string")
|
|
37
|
-
|
|
38
|
-
if (Array.isArray(\u6570\u636E))
|
|
39
|
-
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
35
|
+
if (typeof \u6570\u636E === "string") return \u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E);
|
|
36
|
+
if (Array.isArray(\u6570\u636E)) return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
40
37
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
41
38
|
let \u65B0\u6570\u636E = {};
|
|
42
39
|
for (let key in \u6570\u636E) {
|
|
43
|
-
if (\u6570\u636E.hasOwnProperty(key) === true)
|
|
44
|
-
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
40
|
+
if (\u6570\u636E.hasOwnProperty(key) === true) \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
45
41
|
}
|
|
46
42
|
return \u65B0\u6570\u636E;
|
|
47
43
|
}
|
|
@@ -39,13 +39,12 @@ var import_node_util = require("util");
|
|
|
39
39
|
// src/global/global.ts
|
|
40
40
|
var import_ts_global = require("@lsby/ts-global");
|
|
41
41
|
var import_ts_log = require("@lsby/ts-log");
|
|
42
|
-
|
|
43
|
-
// src/global/web-socket-management.ts
|
|
42
|
+
var log = new import_ts_log.Log("@lsby:net-core");
|
|
44
43
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
45
44
|
constructor(\u8FDE\u63A5\u8868) {
|
|
46
45
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
47
46
|
}
|
|
48
|
-
log =
|
|
47
|
+
log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
49
48
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
50
49
|
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
51
50
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
@@ -54,8 +53,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
54
53
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
55
54
|
}
|
|
56
55
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
57
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
58
|
-
return;
|
|
56
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
59
57
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
60
58
|
}
|
|
61
59
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
@@ -73,10 +71,8 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
73
71
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
74
72
|
}
|
|
75
73
|
};
|
|
76
|
-
|
|
77
|
-
// src/global/global.ts
|
|
78
74
|
var Global = new import_ts_global.GlobalService([
|
|
79
|
-
new import_ts_global.GlobalItem("log",
|
|
75
|
+
new import_ts_global.GlobalItem("log", log),
|
|
80
76
|
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
81
77
|
]);
|
|
82
78
|
|
|
@@ -99,7 +95,7 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
99
95
|
log = Global.getItem("log");
|
|
100
96
|
constructor(t, opt) {
|
|
101
97
|
super(t, async (req, res, \u9644\u52A0\u53C2\u6570) => {
|
|
102
|
-
let
|
|
98
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("JSON\u89E3\u6790\u63D2\u4EF6");
|
|
103
99
|
await new Promise(
|
|
104
100
|
(pRes, _rej) => import_express.default.urlencoded({ extended: true, ...opt })(req, res, () => {
|
|
105
101
|
pRes(null);
|
|
@@ -107,7 +103,7 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
107
103
|
);
|
|
108
104
|
let parseResult = t.safeParse(req.body);
|
|
109
105
|
if (parseResult.success === false) {
|
|
110
|
-
await
|
|
106
|
+
await log2.error("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error);
|
|
111
107
|
throw new Error((0, import_node_util.format)("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error));
|
|
112
108
|
}
|
|
113
109
|
return parseResult.data;
|