@lsby/net-core 0.7.10 → 0.7.11-beta.2
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 +13 -25
- package/dist/cjs/global/global.d.cts +16 -5
- package/dist/cjs/help/interior.cjs +4 -8
- package/dist/cjs/index.cjs +31 -50
- package/dist/cjs/interface/interface-logic.cjs +1 -2
- package/dist/cjs/plugin/extend/custom-data.cjs +9 -23
- 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 +9 -23
- package/dist/cjs/plugin/extend/web-socket.cjs +11 -25
- package/dist/cjs/server/server.cjs +25 -43
- 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-ZGH3QIDP.js → chunk-2SPIZUHY.js} +5 -5
- package/dist/esm/{chunk-47T4ZLNQ.js → chunk-4BFNDHRC.js} +1 -1
- package/dist/esm/{chunk-AB3GCWSG.js → chunk-567N5OFV.js} +12 -24
- package/dist/esm/{chunk-2JQ7AEO4.js → chunk-6SGTOPVW.js} +4 -4
- package/dist/esm/{chunk-DV3NLRIF.js → chunk-AFWSZAXR.js} +9 -15
- package/dist/esm/{chunk-2I2MJFB2.js → chunk-B2WM3PYV.js} +4 -4
- package/dist/esm/{chunk-DWJEBJWU.js → chunk-BHMLNO54.js} +7 -11
- package/dist/esm/{chunk-RHDBIJPA.js → chunk-H3HM4O7J.js} +3 -3
- package/dist/esm/{chunk-DI6KYJ65.js → chunk-LZKS5TUK.js} +1 -2
- package/dist/esm/{chunk-G6IT6LW7.js → chunk-NSW5G2QM.js} +4 -4
- package/dist/esm/{chunk-Y2ZVCJPE.js → chunk-UKAZDGUR.js} +8 -13
- package/dist/esm/{chunk-GMWVTFTC.js → chunk-XE7ESQZU.js} +16 -16
- package/dist/esm/{chunk-NMG5C5AS.js → chunk-ZIVQ3WZA.js} +4 -8
- package/dist/esm/global/global.d.ts +16 -5
- package/dist/esm/global/global.js +5 -3
- package/dist/esm/help/interior.js +1 -1
- package/dist/esm/index.js +15 -15
- 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/package.json +2 -2
- package/dist/cjs/global/web-socket-management.cjs +0 -80
- 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
|
@@ -20,61 +20,49 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
20
20
|
// src/global/global.ts
|
|
21
21
|
var global_exports = {};
|
|
22
22
|
__export(global_exports, {
|
|
23
|
-
Global: () => Global
|
|
23
|
+
Global: () => Global,
|
|
24
|
+
WebSocket\u7BA1\u7406\u5668: () => WebSocket\u7BA1\u7406\u5668
|
|
24
25
|
});
|
|
25
26
|
module.exports = __toCommonJS(global_exports);
|
|
26
27
|
var import_ts_global = require("@lsby/ts-global");
|
|
27
28
|
var import_ts_log = require("@lsby/ts-log");
|
|
28
|
-
|
|
29
|
-
// src/global/web-socket-management.ts
|
|
30
29
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
31
30
|
constructor(\u8FDE\u63A5\u8868) {
|
|
32
31
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
33
32
|
}
|
|
34
|
-
log = Global.
|
|
33
|
+
log = Global.getItemSync("log").extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
35
34
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
36
|
-
|
|
35
|
+
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
37
36
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
38
37
|
}
|
|
39
|
-
|
|
38
|
+
\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(id) {
|
|
40
39
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
41
40
|
}
|
|
42
41
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
43
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
44
|
-
return;
|
|
42
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
45
43
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
46
44
|
}
|
|
47
45
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
48
46
|
return this.\u8FDE\u63A5\u8868[id] ?? null;
|
|
49
47
|
}
|
|
50
|
-
|
|
51
|
-
let log = await this.log;
|
|
48
|
+
\u5220\u9664\u8FDE\u63A5(id) {
|
|
52
49
|
let \u6E05\u7406\u51FD\u6570 = this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
53
50
|
try {
|
|
54
51
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
55
52
|
} catch (err) {
|
|
56
|
-
|
|
57
|
-
}
|
|
58
|
-
try {
|
|
59
|
-
await \u6E05\u7406\u51FD\u6570?.();
|
|
60
|
-
} catch (err) {
|
|
61
|
-
await log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
53
|
+
this.log.errorSync(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
62
54
|
}
|
|
55
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.errorSync(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
63
56
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
64
57
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
65
58
|
}
|
|
66
59
|
};
|
|
67
|
-
|
|
68
|
-
// src/global/global.ts
|
|
69
60
|
var Global = new import_ts_global.GlobalService([
|
|
70
|
-
new import_ts_global.
|
|
71
|
-
|
|
72
|
-
}),
|
|
73
|
-
new import_ts_global.GlobalAsyncItem("WebSocket\u7BA1\u7406\u5668", async () => {
|
|
74
|
-
return new WebSocket\u7BA1\u7406\u5668({});
|
|
75
|
-
})
|
|
61
|
+
new import_ts_global.GlobalItem("log", new import_ts_log.Log("@lsby:net-core")),
|
|
62
|
+
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
76
63
|
]);
|
|
77
64
|
// Annotate the CommonJS export names for ESM import in node:
|
|
78
65
|
0 && (module.exports = {
|
|
79
|
-
Global
|
|
66
|
+
Global,
|
|
67
|
+
WebSocket\u7BA1\u7406\u5668
|
|
80
68
|
});
|
|
@@ -1,8 +1,19 @@
|
|
|
1
|
-
import { GlobalService,
|
|
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) {
|
|
@@ -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,54 +244,40 @@ 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
|
|
250
247
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
251
248
|
constructor(\u8FDE\u63A5\u8868) {
|
|
252
249
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
253
250
|
}
|
|
254
|
-
log = Global.
|
|
251
|
+
log = Global.getItemSync("log").extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
255
252
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
256
|
-
|
|
253
|
+
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
257
254
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
258
255
|
}
|
|
259
|
-
|
|
256
|
+
\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(id) {
|
|
260
257
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
261
258
|
}
|
|
262
259
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
263
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
264
|
-
return;
|
|
260
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
265
261
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
266
262
|
}
|
|
267
263
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
268
264
|
return this.\u8FDE\u63A5\u8868[id] ?? null;
|
|
269
265
|
}
|
|
270
|
-
|
|
271
|
-
let log = await this.log;
|
|
266
|
+
\u5220\u9664\u8FDE\u63A5(id) {
|
|
272
267
|
let \u6E05\u7406\u51FD\u6570 = this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
273
268
|
try {
|
|
274
269
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
275
270
|
} catch (err) {
|
|
276
|
-
|
|
277
|
-
}
|
|
278
|
-
try {
|
|
279
|
-
await \u6E05\u7406\u51FD\u6570?.();
|
|
280
|
-
} catch (err) {
|
|
281
|
-
await log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
271
|
+
this.log.errorSync(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
282
272
|
}
|
|
273
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.errorSync(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
283
274
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
284
275
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
285
276
|
}
|
|
286
277
|
};
|
|
287
|
-
|
|
288
|
-
// src/global/global.ts
|
|
289
278
|
var Global = new import_ts_global.GlobalService([
|
|
290
|
-
new import_ts_global.
|
|
291
|
-
|
|
292
|
-
}),
|
|
293
|
-
new import_ts_global.GlobalAsyncItem("WebSocket\u7BA1\u7406\u5668", async () => {
|
|
294
|
-
return new WebSocket\u7BA1\u7406\u5668({});
|
|
295
|
-
})
|
|
279
|
+
new import_ts_global.GlobalItem("log", new import_ts_log.Log("@lsby:net-core")),
|
|
280
|
+
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
296
281
|
]);
|
|
297
282
|
|
|
298
283
|
// src/plugin/extend/custom-data.ts
|
|
@@ -314,20 +299,16 @@ var import_node_util = require("util");
|
|
|
314
299
|
// src/help/interior.ts
|
|
315
300
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
316
301
|
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
317
|
-
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
318
|
-
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
302
|
+
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
319
303
|
return \u5185\u5BB9;
|
|
320
304
|
}
|
|
321
305
|
function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
322
|
-
if (typeof \u6570\u636E === "string")
|
|
323
|
-
|
|
324
|
-
if (Array.isArray(\u6570\u636E))
|
|
325
|
-
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
306
|
+
if (typeof \u6570\u636E === "string") return \u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E);
|
|
307
|
+
if (Array.isArray(\u6570\u636E)) return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
326
308
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
327
309
|
let \u65B0\u6570\u636E = {};
|
|
328
310
|
for (let key in \u6570\u636E) {
|
|
329
|
-
if (\u6570\u636E.hasOwnProperty(key) === true)
|
|
330
|
-
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
311
|
+
if (\u6570\u636E.hasOwnProperty(key) === true) \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
331
312
|
}
|
|
332
313
|
return \u65B0\u6570\u636E;
|
|
333
314
|
}
|
|
@@ -472,7 +453,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
472
453
|
await log.debug("\u53D1\u9001 WebSocket \u4FE1\u606F", { \u4FE1\u606F });
|
|
473
454
|
await new Promise((resolve, reject) => {
|
|
474
455
|
ws\u53E5\u67C4?.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
475
|
-
if (err !== void 0) {
|
|
456
|
+
if (err !== void 0 && err !== null) {
|
|
476
457
|
log.warnSync("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err });
|
|
477
458
|
return reject(err);
|
|
478
459
|
}
|
|
@@ -483,7 +464,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
483
464
|
},
|
|
484
465
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
485
466
|
await log.debug("\u5173\u95ED WebSocket \u8FDE\u63A5", { wsId });
|
|
486
|
-
|
|
467
|
+
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(wsId);
|
|
487
468
|
},
|
|
488
469
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u6E05\u7406\u51FD\u6570) {
|
|
489
470
|
await log.debug("\u8BBE\u7F6E WebSocket \u6E05\u7406\u51FD\u6570", { wsId });
|
|
@@ -589,28 +570,28 @@ var \u670D\u52A1\u5668 = class {
|
|
|
589
570
|
});
|
|
590
571
|
wss.on("connection", async (ws, req) => {
|
|
591
572
|
let log = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
592
|
-
|
|
573
|
+
log.debugSync("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
593
574
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
594
575
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
595
|
-
|
|
576
|
+
log.errorSync("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
596
577
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
597
578
|
}
|
|
598
|
-
|
|
599
|
-
let WebSocket\u7BA1\u7406\u56682 =
|
|
600
|
-
let \u8FDE\u63A5\u5DF2\u5B58\u5728 =
|
|
579
|
+
log.debugSync("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
580
|
+
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
581
|
+
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
601
582
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
602
|
-
|
|
583
|
+
log.errorSync("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
603
584
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
604
585
|
}
|
|
605
|
-
|
|
606
|
-
|
|
586
|
+
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
587
|
+
log.infoSync("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
607
588
|
ws.on("close", async () => {
|
|
608
|
-
|
|
609
|
-
|
|
589
|
+
log.infoSync("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
590
|
+
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
610
591
|
});
|
|
611
592
|
ws.on("error", async (err) => {
|
|
612
|
-
|
|
613
|
-
|
|
593
|
+
log.errorSync("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
594
|
+
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
614
595
|
});
|
|
615
596
|
});
|
|
616
597
|
}
|
|
@@ -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,54 +27,40 @@ 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
|
|
32
30
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
33
31
|
constructor(\u8FDE\u63A5\u8868) {
|
|
34
32
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
35
33
|
}
|
|
36
|
-
log = Global.
|
|
34
|
+
log = Global.getItemSync("log").extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
37
35
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
38
|
-
|
|
36
|
+
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
39
37
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
40
38
|
}
|
|
41
|
-
|
|
39
|
+
\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(id) {
|
|
42
40
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
43
41
|
}
|
|
44
42
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
45
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
46
|
-
return;
|
|
43
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
47
44
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
48
45
|
}
|
|
49
46
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
50
47
|
return this.\u8FDE\u63A5\u8868[id] ?? null;
|
|
51
48
|
}
|
|
52
|
-
|
|
53
|
-
let log = await this.log;
|
|
49
|
+
\u5220\u9664\u8FDE\u63A5(id) {
|
|
54
50
|
let \u6E05\u7406\u51FD\u6570 = this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
55
51
|
try {
|
|
56
52
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
57
53
|
} catch (err) {
|
|
58
|
-
|
|
59
|
-
}
|
|
60
|
-
try {
|
|
61
|
-
await \u6E05\u7406\u51FD\u6570?.();
|
|
62
|
-
} catch (err) {
|
|
63
|
-
await log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
54
|
+
this.log.errorSync(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
64
55
|
}
|
|
56
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.errorSync(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
65
57
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
66
58
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
67
59
|
}
|
|
68
60
|
};
|
|
69
|
-
|
|
70
|
-
// src/global/global.ts
|
|
71
61
|
var Global = new import_ts_global.GlobalService([
|
|
72
|
-
new import_ts_global.
|
|
73
|
-
|
|
74
|
-
}),
|
|
75
|
-
new import_ts_global.GlobalAsyncItem("WebSocket\u7BA1\u7406\u5668", async () => {
|
|
76
|
-
return new WebSocket\u7BA1\u7406\u5668({});
|
|
77
|
-
})
|
|
62
|
+
new import_ts_global.GlobalItem("log", new import_ts_log.Log("@lsby:net-core")),
|
|
63
|
+
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
78
64
|
]);
|
|
79
65
|
|
|
80
66
|
// src/plugin/plug.ts
|
|
@@ -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,54 +39,40 @@ 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
|
|
44
42
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
45
43
|
constructor(\u8FDE\u63A5\u8868) {
|
|
46
44
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
47
45
|
}
|
|
48
|
-
log = Global.
|
|
46
|
+
log = Global.getItemSync("log").extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
49
47
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
50
|
-
|
|
48
|
+
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
51
49
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
52
50
|
}
|
|
53
|
-
|
|
51
|
+
\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(id) {
|
|
54
52
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
55
53
|
}
|
|
56
54
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
57
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
58
|
-
return;
|
|
55
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
59
56
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
60
57
|
}
|
|
61
58
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
62
59
|
return this.\u8FDE\u63A5\u8868[id] ?? null;
|
|
63
60
|
}
|
|
64
|
-
|
|
65
|
-
let log = await this.log;
|
|
61
|
+
\u5220\u9664\u8FDE\u63A5(id) {
|
|
66
62
|
let \u6E05\u7406\u51FD\u6570 = this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
67
63
|
try {
|
|
68
64
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
69
65
|
} catch (err) {
|
|
70
|
-
|
|
71
|
-
}
|
|
72
|
-
try {
|
|
73
|
-
await \u6E05\u7406\u51FD\u6570?.();
|
|
74
|
-
} catch (err) {
|
|
75
|
-
await log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
66
|
+
this.log.errorSync(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
76
67
|
}
|
|
68
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.errorSync(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
77
69
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
78
70
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
79
71
|
}
|
|
80
72
|
};
|
|
81
|
-
|
|
82
|
-
// src/global/global.ts
|
|
83
73
|
var Global = new import_ts_global.GlobalService([
|
|
84
|
-
new import_ts_global.
|
|
85
|
-
|
|
86
|
-
}),
|
|
87
|
-
new import_ts_global.GlobalAsyncItem("WebSocket\u7BA1\u7406\u5668", async () => {
|
|
88
|
-
return new WebSocket\u7BA1\u7406\u5668({});
|
|
89
|
-
})
|
|
74
|
+
new import_ts_global.GlobalItem("log", new import_ts_log.Log("@lsby:net-core")),
|
|
75
|
+
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
90
76
|
]);
|
|
91
77
|
|
|
92
78
|
// src/plugin/plug.ts
|
|
@@ -29,54 +29,40 @@ var import_zod = require("zod");
|
|
|
29
29
|
// src/global/global.ts
|
|
30
30
|
var import_ts_global = require("@lsby/ts-global");
|
|
31
31
|
var import_ts_log = require("@lsby/ts-log");
|
|
32
|
-
|
|
33
|
-
// src/global/web-socket-management.ts
|
|
34
32
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
35
33
|
constructor(\u8FDE\u63A5\u8868) {
|
|
36
34
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
37
35
|
}
|
|
38
|
-
log = Global.
|
|
36
|
+
log = Global.getItemSync("log").extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
39
37
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
40
|
-
|
|
38
|
+
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
41
39
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
42
40
|
}
|
|
43
|
-
|
|
41
|
+
\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(id) {
|
|
44
42
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
45
43
|
}
|
|
46
44
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
47
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
48
|
-
return;
|
|
45
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
49
46
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
50
47
|
}
|
|
51
48
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
52
49
|
return this.\u8FDE\u63A5\u8868[id] ?? null;
|
|
53
50
|
}
|
|
54
|
-
|
|
55
|
-
let log = await this.log;
|
|
51
|
+
\u5220\u9664\u8FDE\u63A5(id) {
|
|
56
52
|
let \u6E05\u7406\u51FD\u6570 = this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
57
53
|
try {
|
|
58
54
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
59
55
|
} catch (err) {
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
try {
|
|
63
|
-
await \u6E05\u7406\u51FD\u6570?.();
|
|
64
|
-
} catch (err) {
|
|
65
|
-
await log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
56
|
+
this.log.errorSync(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
66
57
|
}
|
|
58
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.errorSync(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
67
59
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
68
60
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
69
61
|
}
|
|
70
62
|
};
|
|
71
|
-
|
|
72
|
-
// src/global/global.ts
|
|
73
63
|
var Global = new import_ts_global.GlobalService([
|
|
74
|
-
new import_ts_global.
|
|
75
|
-
|
|
76
|
-
}),
|
|
77
|
-
new import_ts_global.GlobalAsyncItem("WebSocket\u7BA1\u7406\u5668", async () => {
|
|
78
|
-
return new WebSocket\u7BA1\u7406\u5668({});
|
|
79
|
-
})
|
|
64
|
+
new import_ts_global.GlobalItem("log", new import_ts_log.Log("@lsby:net-core")),
|
|
65
|
+
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
80
66
|
]);
|
|
81
67
|
|
|
82
68
|
// src/plugin/plug.ts
|
|
@@ -134,7 +120,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
134
120
|
await log.debug("\u53D1\u9001 WebSocket \u4FE1\u606F", { \u4FE1\u606F });
|
|
135
121
|
await new Promise((resolve, reject) => {
|
|
136
122
|
ws\u53E5\u67C4?.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
137
|
-
if (err !== void 0) {
|
|
123
|
+
if (err !== void 0 && err !== null) {
|
|
138
124
|
log.warnSync("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err });
|
|
139
125
|
return reject(err);
|
|
140
126
|
}
|
|
@@ -145,7 +131,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
145
131
|
},
|
|
146
132
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
147
133
|
await log.debug("\u5173\u95ED WebSocket \u8FDE\u63A5", { wsId });
|
|
148
|
-
|
|
134
|
+
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(wsId);
|
|
149
135
|
},
|
|
150
136
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u6E05\u7406\u51FD\u6570) {
|
|
151
137
|
await log.debug("\u8BBE\u7F6E WebSocket \u6E05\u7406\u51FD\u6570", { wsId });
|