@lsby/net-core 0.7.30 → 0.8.0
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 +11 -11
- package/dist/bin/gen-api-list/index.cjs +11 -11
- package/dist/bin/gen-api-type/bin.cjs +13 -13
- package/dist/bin/gen-api-type/index.cjs +13 -13
- package/dist/bin/gen-test/bin.cjs +12 -12
- package/dist/bin/gen-test/index.cjs +12 -12
- package/dist/cjs/bin/gen-api-list/bin.cjs +11 -11
- package/dist/cjs/bin/gen-api-list/index.cjs +11 -11
- package/dist/cjs/bin/gen-api-type/bin.cjs +13 -13
- package/dist/cjs/bin/gen-api-type/index.cjs +13 -13
- package/dist/cjs/bin/gen-test/bin.cjs +12 -12
- package/dist/cjs/bin/gen-test/index.cjs +12 -12
- package/dist/cjs/global/global.cjs +3 -3
- package/dist/cjs/index.cjs +50 -51
- package/dist/cjs/index.d.cts +1 -1
- package/dist/cjs/interface/interface-base.d.cts +1 -1
- package/dist/cjs/interface/interface-logic.cjs +5 -6
- package/dist/cjs/interface/interface-logic.d.cts +1 -1
- package/dist/cjs/interface/interface-result.d.cts +1 -1
- package/dist/cjs/{interface-base-VXPI0A-u.d.cts → interface-base-xfTkYYz8.d.cts} +5 -7
- package/dist/cjs/plugin/extend/custom-data.cjs +4 -4
- package/dist/cjs/plugin/extend/custom-data.d.cts +1 -1
- package/dist/cjs/plugin/extend/json.cjs +3 -3
- package/dist/cjs/plugin/extend/json.d.cts +3 -3
- package/dist/cjs/plugin/extend/log-headers.cjs +1 -1
- package/dist/cjs/plugin/extend/log-headers.d.cts +1 -1
- package/dist/cjs/plugin/extend/query.cjs +3 -3
- package/dist/cjs/plugin/extend/query.d.cts +3 -3
- package/dist/cjs/plugin/extend/send-file-plugin.d.cts +1 -1
- package/dist/cjs/plugin/extend/urlencoded.cjs +4 -4
- package/dist/cjs/plugin/extend/urlencoded.d.cts +1 -1
- package/dist/cjs/plugin/extend/web-socket.cjs +11 -11
- package/dist/cjs/plugin/extend/web-socket.d.cts +3 -3
- package/dist/cjs/plugin/plug.d.cts +2 -2
- package/dist/cjs/server/server.cjs +28 -28
- package/dist/cjs/server/server.d.cts +1 -1
- package/dist/cjs/wrapper/common-wrapper-return.d.cts +1 -1
- package/dist/cjs/wrapper/common-wrapper.d.cts +1 -1
- package/dist/cjs/wrapper/deferred-result-wrapper.d.cts +1 -1
- package/dist/esm/bin/gen-api-list/bin.js +1 -1
- package/dist/esm/bin/gen-api-list/index.js +1 -1
- package/dist/esm/bin/gen-api-type/bin.js +1 -1
- package/dist/esm/bin/gen-api-type/index.js +1 -1
- package/dist/esm/bin/gen-test/bin.js +1 -1
- package/dist/esm/bin/gen-test/index.js +1 -1
- package/dist/esm/{chunk-TUKBYYRK.js → chunk-7MHKNSNT.js} +1 -1
- package/dist/esm/{chunk-NI676K3Z.js → chunk-AFWSZAXR.js} +12 -12
- package/dist/esm/{chunk-BJUUGCWM.js → chunk-AY6KWNWX.js} +3 -3
- package/dist/esm/{chunk-J3NG7DBJ.js → chunk-EW7SZA75.js} +9 -9
- package/dist/esm/{chunk-RPDD2QLE.js → chunk-GMYXAJS3.js} +3 -3
- package/dist/esm/{chunk-BRKIPTOQ.js → chunk-IE3TJ3RT.js} +5 -6
- package/dist/esm/{chunk-REFLUHAF.js → chunk-JSSODPOL.js} +2 -2
- package/dist/esm/{chunk-2ZZ7CFND.js → chunk-NAQTIAMT.js} +2 -2
- package/dist/esm/{chunk-Q3UCXVAN.js → chunk-OUDYK6TE.js} +3 -3
- package/dist/esm/{chunk-4POMXQ7K.js → chunk-REQ5ZXOQ.js} +13 -13
- package/dist/esm/{chunk-JLDRKJBS.js → chunk-TBBZDFIS.js} +26 -26
- package/dist/esm/{chunk-LUQFJIZQ.js → chunk-UKAZDGUR.js} +11 -11
- package/dist/esm/global/global.js +1 -1
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/index.js +13 -13
- package/dist/esm/interface/interface-base.d.ts +1 -1
- package/dist/esm/interface/interface-logic.d.ts +1 -1
- package/dist/esm/interface/interface-logic.js +1 -1
- package/dist/esm/interface/interface-result.d.ts +1 -1
- package/dist/esm/{interface-base-DFbTGNYa.d.ts → interface-base-C4pgIA1y.d.ts} +5 -7
- package/dist/esm/plugin/extend/custom-data.d.ts +1 -1
- package/dist/esm/plugin/extend/custom-data.js +2 -2
- package/dist/esm/plugin/extend/json.d.ts +3 -3
- package/dist/esm/plugin/extend/json.js +1 -1
- package/dist/esm/plugin/extend/log-headers.d.ts +1 -1
- package/dist/esm/plugin/extend/log-headers.js +1 -1
- package/dist/esm/plugin/extend/query.d.ts +3 -3
- package/dist/esm/plugin/extend/query.js +1 -1
- package/dist/esm/plugin/extend/send-file-plugin.d.ts +1 -1
- package/dist/esm/plugin/extend/urlencoded.d.ts +1 -1
- package/dist/esm/plugin/extend/urlencoded.js +2 -2
- package/dist/esm/plugin/extend/web-socket.d.ts +3 -3
- package/dist/esm/plugin/extend/web-socket.js +2 -2
- package/dist/esm/plugin/plug.d.ts +2 -2
- package/dist/esm/server/server.d.ts +1 -1
- package/dist/esm/server/server.js +2 -2
- package/dist/esm/wrapper/common-wrapper-return.d.ts +1 -1
- package/dist/esm/wrapper/common-wrapper.d.ts +1 -1
- package/dist/esm/wrapper/deferred-result-wrapper.d.ts +1 -1
- package/package.json +3 -3
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import {
|
|
2
|
+
import { Either } from '@lsby/ts-fp-data';
|
|
3
3
|
import { Request, Response } from 'express';
|
|
4
4
|
import { 联合转元组 as _____ } from './help/interior.cjs';
|
|
5
5
|
import { Log } from '@lsby/ts-log';
|
|
@@ -42,12 +42,10 @@ declare class 插件<Obj extends z.AnyZodObject> {
|
|
|
42
42
|
运行(req: Request, res: Response, 附加参数: 请求附加参数类型): Promise<z.infer<Obj>>;
|
|
43
43
|
}
|
|
44
44
|
type 任意插件 = 插件<any>;
|
|
45
|
-
type
|
|
46
|
-
type
|
|
47
|
-
type 取Task插件内部类型<A> = A extends Task<插件<infer x>> ? x : never;
|
|
48
|
-
type 取Task插件类型<A> = A extends Task<infer x> ? x : never;
|
|
45
|
+
type 插件项类型 = 插件<z.AnyZodObject>;
|
|
46
|
+
type 取插件内部类型<A> = A extends 插件<infer x> ? x : never;
|
|
49
47
|
type 取插件内部ts类型<A> = A extends 插件<infer x> ? z.infer<x> : never;
|
|
50
|
-
type 合并插件结果<Arr extends Array<插件项类型>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<插件项类型> ? z.infer
|
|
48
|
+
type 合并插件结果<Arr extends Array<插件项类型>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<插件项类型> ? z.infer<取插件内部类型<插件项>> & 合并插件结果<xs> : {} : {} : {};
|
|
51
49
|
|
|
52
50
|
type 清理函数类型<插件类型 extends 插件项类型[], 逻辑附加参数类型 extends 接口逻辑附加参数类型> = (参数: 合并插件结果<插件类型>, 逻辑附加参数: 逻辑附加参数类型, 请求附加参数: 请求附加参数类型) => Promise<void>;
|
|
53
51
|
type 空对象 = Record<any, never>;
|
|
@@ -197,4 +195,4 @@ type 获得接口正确形式<A> = A extends 接口<any, any, any, any, infer X,
|
|
|
197
195
|
type 获得接口结果转换器类型<A> = A extends 接口<any, any, any, any, any, infer X, any> ? X : never;
|
|
198
196
|
type 获得接口结果返回器类型<A> = A extends 接口<any, any, any, any, any, any, infer X> ? X : never;
|
|
199
197
|
|
|
200
|
-
export { type 插件项类型 as A, type
|
|
198
|
+
export { type 插件项类型 as A, type 取插件内部ts类型 as B, type 接口方法类型 as a, 接口 as b, type 获得接口方法类型 as c, type 获得接口逻辑类型 as d, type 获得接口错误形式 as e, type 获得接口正确形式 as f, type 获得接口结果转换器类型 as g, type 获得接口结果返回器类型 as h, type 接口逻辑错误类型 as i, type 接口逻辑正确类型 as j, type 接口逻辑附加参数类型 as k, 接口逻辑Base as l, 接口逻辑 as m, type 任意接口逻辑 as n, type 获得接口逻辑插件类型 as o, type 获得接口逻辑附加参数类型 as p, type 获得接口逻辑错误类型 as q, type 获得接口逻辑正确类型 as r, type 获得接口逻辑上游接口类型 as s, type 获得接口逻辑最后接口类型 as t, type 计算接口逻辑错误结果 as u, type 计算接口逻辑正确结果 as v, 接口结果转换器 as w, type 任意接口结果转换器 as x, 常用延时直接形式转换器 as y, type 任意插件 as z, type 任意接口 as 任, type 兼容空对象 as 兼, type 取插件内部类型 as 取, type 可调用接口逻辑 as 可, type 合并插件结果 as 合, 常用形式转换器 as 常, type 接口路径类型 as 接, 插件 as 插, 服务器 as 服, type 清理函数类型 as 清, type 空对象 as 空, type 获得接口路径类型 as 获, type 计算接口逻辑参数 as 计, type 请求附加参数类型 as 请 };
|
|
@@ -34,7 +34,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
34
34
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
35
35
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
36
36
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
37
|
-
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
37
|
+
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}`}`);
|
|
38
38
|
});
|
|
39
39
|
}, 3e4);
|
|
40
40
|
}
|
|
@@ -59,7 +59,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
59
59
|
try {
|
|
60
60
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
61
61
|
} catch (err) {
|
|
62
|
-
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
62
|
+
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}`}`);
|
|
63
63
|
}
|
|
64
64
|
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
65
65
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
@@ -74,7 +74,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
77
|
-
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
77
|
+
await this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
};
|
|
@@ -103,7 +103,7 @@ var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
103
103
|
constructor(t, data) {
|
|
104
104
|
super(t, async (_res, _req, \u9644\u52A0\u53C2\u6570) => {
|
|
105
105
|
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6");
|
|
106
|
-
log2.debug("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6\u8FD0\u884C, \u7ED3\u679C: %o", data);
|
|
106
|
+
await log2.debug("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6\u8FD0\u884C, \u7ED3\u679C: %o", data);
|
|
107
107
|
return data;
|
|
108
108
|
});
|
|
109
109
|
}
|
|
@@ -81,13 +81,13 @@ var JSON\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
81
81
|
pRes(null);
|
|
82
82
|
})
|
|
83
83
|
);
|
|
84
|
-
log.debug("\u51C6\u5907\u89E3\u6790 JSON\uFF1A%o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.body)));
|
|
84
|
+
await log.debug("\u51C6\u5907\u89E3\u6790 JSON\uFF1A%o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.body)));
|
|
85
85
|
let parseResult = t.safeParse(req.body);
|
|
86
86
|
if (parseResult.success === false) {
|
|
87
|
-
log.error("\u89E3\u6790 JSON \u5931\u8D25\uFF1A%o", parseResult.error);
|
|
87
|
+
await log.error("\u89E3\u6790 JSON \u5931\u8D25\uFF1A%o", parseResult.error);
|
|
88
88
|
throw new Error((0, import_node_util.format)("\u89E3\u6790 JSON \u5931\u8D25: %o", parseResult.error));
|
|
89
89
|
}
|
|
90
|
-
log.debug("\u6210\u529F\u89E3\u6790 JSON");
|
|
90
|
+
await log.debug("\u6210\u529F\u89E3\u6790 JSON");
|
|
91
91
|
return parseResult.data;
|
|
92
92
|
});
|
|
93
93
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import express from 'express';
|
|
2
2
|
import { AnyZodObject, z } from 'zod';
|
|
3
|
-
import { 插 as __,
|
|
3
|
+
import { 插 as __, A as _____, 取 as _______, o as __________ } from '../../interface-base-xfTkYYz8.cjs';
|
|
4
4
|
import '@lsby/ts-fp-data';
|
|
5
5
|
import '../../help/interior.cjs';
|
|
6
6
|
import '@lsby/ts-log';
|
|
@@ -13,8 +13,8 @@ declare class JSON解析插件<Result extends AnyZodObject> extends __<Result> {
|
|
|
13
13
|
constructor(t: Result, opt: Parameters<typeof express.json>[0]);
|
|
14
14
|
}
|
|
15
15
|
type 任意JSON解析插件 = JSON解析插件<any>;
|
|
16
|
-
type 任意JSON解析插件项 =
|
|
17
|
-
type 合并JSON插件结果<Arr extends Array<_____
|
|
16
|
+
type 任意JSON解析插件项 = 任意JSON解析插件;
|
|
17
|
+
type 合并JSON插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意JSON解析插件项 ? z.infer<_______<插件项>> & 合并JSON插件结果<xs> : 合并JSON插件结果<xs> : {} : {} : {};
|
|
18
18
|
type 计算接口逻辑JSON参数<接口逻辑> = 合并JSON插件结果<__________<接口逻辑>>;
|
|
19
19
|
|
|
20
20
|
export { JSON解析插件, type 任意JSON解析插件, type 任意JSON解析插件项, type 合并JSON插件结果, type 计算接口逻辑JSON参数 };
|
|
@@ -45,7 +45,7 @@ var \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
45
45
|
constructor() {
|
|
46
46
|
super(zod\u7C7B\u578B\u8868\u793A, async (req, res, \u9644\u52A0\u53C2\u6570) => {
|
|
47
47
|
let log = \u9644\u52A0\u53C2\u6570.log.extend("\u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6");
|
|
48
|
-
log.debug(req.headers);
|
|
48
|
+
await log.debug(req.headers);
|
|
49
49
|
return {};
|
|
50
50
|
});
|
|
51
51
|
}
|
|
@@ -65,13 +65,13 @@ var GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
65
65
|
constructor(t) {
|
|
66
66
|
super(t, async (req, _res, \u9644\u52A0\u53C2\u6570) => {
|
|
67
67
|
let log = \u9644\u52A0\u53C2\u6570.log.extend("GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6");
|
|
68
|
-
log.debug("\u51C6\u5907\u89E3\u6790 GET \u53C2\u6570\uFF1A%o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.query)));
|
|
68
|
+
await log.debug("\u51C6\u5907\u89E3\u6790 GET \u53C2\u6570\uFF1A%o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.query)));
|
|
69
69
|
let parseResult = t.safeParse(req.query);
|
|
70
70
|
if (parseResult.success === false) {
|
|
71
|
-
log.error("\u89E3\u6790 GET \u53C2\u6570\u5931\u8D25\uFF1A%o", parseResult.error);
|
|
71
|
+
await log.error("\u89E3\u6790 GET \u53C2\u6570\u5931\u8D25\uFF1A%o", parseResult.error);
|
|
72
72
|
throw new Error((0, import_node_util.format)("\u89E3\u6790 GET \u53C2\u6570\u5931\u8D25: %o", parseResult.error));
|
|
73
73
|
}
|
|
74
|
-
log.debug("\u6210\u529F\u89E3\u6790 GET \u53C2\u6570");
|
|
74
|
+
await log.debug("\u6210\u529F\u89E3\u6790 GET \u53C2\u6570");
|
|
75
75
|
return parseResult.data;
|
|
76
76
|
});
|
|
77
77
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AnyZodObject, z } from 'zod';
|
|
2
|
-
import { 插 as __,
|
|
2
|
+
import { 插 as __, A as _____, 取 as _______, o as __________ } from '../../interface-base-xfTkYYz8.cjs';
|
|
3
3
|
import '@lsby/ts-fp-data';
|
|
4
4
|
import 'express';
|
|
5
5
|
import '../../help/interior.cjs';
|
|
@@ -13,8 +13,8 @@ declare class GET参数解析插件<Result extends AnyZodObject> extends __<Resu
|
|
|
13
13
|
constructor(t: Result);
|
|
14
14
|
}
|
|
15
15
|
type 任意GET参数解析插件 = GET参数解析插件<any>;
|
|
16
|
-
type 任意GET参数解析插件项 =
|
|
17
|
-
type 合并GET插件结果<Arr extends Array<_____
|
|
16
|
+
type 任意GET参数解析插件项 = 任意GET参数解析插件;
|
|
17
|
+
type 合并GET插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意GET参数解析插件项 ? z.infer<_______<插件项>> & 合并GET插件结果<xs> : 合并GET插件结果<xs> : {} : {} : {};
|
|
18
18
|
type 计算接口逻辑GET参数<接口逻辑> = 合并GET插件结果<__________<接口逻辑>>;
|
|
19
19
|
|
|
20
20
|
export { GET参数解析插件, type 任意GET参数解析插件, type 任意GET参数解析插件项, type 合并GET插件结果, type 计算接口逻辑GET参数 };
|
|
@@ -46,7 +46,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
46
46
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
47
47
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
48
48
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
49
|
-
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${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
50
|
});
|
|
51
51
|
}, 3e4);
|
|
52
52
|
}
|
|
@@ -71,7 +71,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
71
71
|
try {
|
|
72
72
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
73
73
|
} catch (err) {
|
|
74
|
-
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${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
75
|
}
|
|
76
76
|
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
77
77
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
@@ -86,7 +86,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
89
|
-
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
89
|
+
await this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
};
|
|
@@ -122,7 +122,7 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
122
122
|
);
|
|
123
123
|
let parseResult = t.safeParse(req.body);
|
|
124
124
|
if (parseResult.success === false) {
|
|
125
|
-
log2.error("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error);
|
|
125
|
+
await log2.error("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error);
|
|
126
126
|
throw new Error((0, import_node_util.format)("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error));
|
|
127
127
|
}
|
|
128
128
|
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-
|
|
3
|
+
import { 插 as __ } from '../../interface-base-xfTkYYz8.cjs';
|
|
4
4
|
import '@lsby/ts-fp-data';
|
|
5
5
|
import '../../help/interior.cjs';
|
|
6
6
|
import '@lsby/ts-log';
|
|
@@ -36,7 +36,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
36
36
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
37
37
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
38
38
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
39
|
-
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
39
|
+
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}`}`);
|
|
40
40
|
});
|
|
41
41
|
}, 3e4);
|
|
42
42
|
}
|
|
@@ -61,7 +61,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
61
61
|
try {
|
|
62
62
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
63
63
|
} catch (err) {
|
|
64
|
-
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
64
|
+
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}`}`);
|
|
65
65
|
}
|
|
66
66
|
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
67
67
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
@@ -76,7 +76,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
79
|
-
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
79
|
+
await this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
};
|
|
@@ -116,12 +116,12 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
116
116
|
let WebSocket\u7BA1\u7406\u56682 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
|
|
117
117
|
let ws\u53E5\u67C4 = null;
|
|
118
118
|
let wsId = req.headers["ws-client-id"];
|
|
119
|
-
log2.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
119
|
+
await log2.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
120
120
|
if (typeof wsId !== "string") {
|
|
121
|
-
log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket Id");
|
|
121
|
+
await log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket Id");
|
|
122
122
|
return { ws\u64CD\u4F5C: null };
|
|
123
123
|
}
|
|
124
|
-
log2.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
|
|
124
|
+
await log2.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
|
|
125
125
|
return {
|
|
126
126
|
ws\u64CD\u4F5C: {
|
|
127
127
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
@@ -129,17 +129,17 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
129
129
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
130
130
|
}
|
|
131
131
|
if (ws\u53E5\u67C4 === null) {
|
|
132
|
-
log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
|
|
132
|
+
await log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
|
|
133
133
|
return;
|
|
134
134
|
}
|
|
135
135
|
if (ws\u53E5\u67C4.readyState !== import_ws2.WebSocket.OPEN) {
|
|
136
|
-
log2.warn("WebSocket \u672A\u6253\u5F00\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F", { wsId });
|
|
136
|
+
await log2.warn("WebSocket \u672A\u6253\u5F00\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F", { wsId });
|
|
137
137
|
return;
|
|
138
138
|
}
|
|
139
139
|
await new Promise((resolve, reject) => {
|
|
140
140
|
ws\u53E5\u67C4?.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
141
141
|
if (err !== void 0 && err !== null) {
|
|
142
|
-
log2.warn("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err });
|
|
142
|
+
log2.warn("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err }).catch((a) => `\u65E5\u5FD7\u8F93\u51FA\u9519\u8BEF: ${a}: \u65E5\u5FD7\u5185\u5BB9: ${`\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25: ${err}`}`);
|
|
143
143
|
return reject(err);
|
|
144
144
|
}
|
|
145
145
|
resolve();
|
|
@@ -147,11 +147,11 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
147
147
|
});
|
|
148
148
|
},
|
|
149
149
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
150
|
-
log2.debug("\u5173\u95ED WebSocket \u8FDE\u63A5", { wsId });
|
|
150
|
+
await log2.debug("\u5173\u95ED WebSocket \u8FDE\u63A5", { wsId });
|
|
151
151
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(wsId);
|
|
152
152
|
},
|
|
153
153
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u6E05\u7406\u51FD\u6570) {
|
|
154
|
-
log2.debug("\u8BBE\u7F6E WebSocket \u6E05\u7406\u51FD\u6570", { wsId });
|
|
154
|
+
await log2.debug("\u8BBE\u7F6E WebSocket \u6E05\u7406\u51FD\u6570", { wsId });
|
|
155
155
|
await WebSocket\u7BA1\u7406\u56682.\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(wsId, \u6E05\u7406\u51FD\u6570);
|
|
156
156
|
}
|
|
157
157
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { 插 as __,
|
|
2
|
+
import { 插 as __, A as _____ } from '../../interface-base-xfTkYYz8.cjs';
|
|
3
3
|
import '@lsby/ts-fp-data';
|
|
4
4
|
import 'express';
|
|
5
5
|
import '../../help/interior.cjs';
|
|
@@ -21,8 +21,8 @@ declare class WebSocket插件<信息 extends z.AnyZodObject | z.ZodUnion<any>> e
|
|
|
21
21
|
constructor(信息描述: 信息);
|
|
22
22
|
}
|
|
23
23
|
type 任意WS插件 = WebSocket插件<any>;
|
|
24
|
-
type 任意WS插件项 =
|
|
24
|
+
type 任意WS插件项 = 任意WS插件;
|
|
25
25
|
type 取WS插件泛型<A> = A extends WebSocket插件<infer x> ? x : never;
|
|
26
|
-
type 取第一个WS插件结果<Arr extends Array<_____
|
|
26
|
+
type 取第一个WS插件结果<Arr extends Array<_____>> = Arr extends [] ? {} : Arr extends [infer x, ...infer xs] ? x extends infer 插件项 ? xs extends Array<_____> ? 插件项 extends 任意WS插件项 ? z.infer<取WS插件泛型<插件项>> : 取第一个WS插件结果<xs> : {} : {} : {};
|
|
27
27
|
|
|
28
28
|
export { WebSocket插件, type 任意WS插件, type 任意WS插件项, type 取WS插件泛型, type 取第一个WS插件结果 };
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import '@lsby/ts-fp-data';
|
|
2
1
|
import 'express';
|
|
3
2
|
import 'zod';
|
|
4
|
-
export { z as 任意插件,
|
|
3
|
+
export { z as 任意插件, B as 取插件内部ts类型, 取 as 取插件内部类型, 合 as 合并插件结果, 插 as 插件, A as 插件项类型 } from '../interface-base-xfTkYYz8.cjs';
|
|
4
|
+
import '@lsby/ts-fp-data';
|
|
5
5
|
import '../help/interior.cjs';
|
|
6
6
|
import '@lsby/ts-log';
|
|
7
7
|
import 'node:http';
|
|
@@ -49,7 +49,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
49
49
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
50
50
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
51
51
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
52
|
-
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
52
|
+
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}`}`);
|
|
53
53
|
});
|
|
54
54
|
}, 3e4);
|
|
55
55
|
}
|
|
@@ -74,7 +74,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
74
74
|
try {
|
|
75
75
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
76
76
|
} catch (err) {
|
|
77
|
-
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
77
|
+
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}`}`);
|
|
78
78
|
}
|
|
79
79
|
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
80
80
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
@@ -89,7 +89,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
92
|
-
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
92
|
+
await this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
};
|
|
@@ -130,7 +130,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
130
130
|
let log2 = (await this.log).extend("\u670D\u52A1\u5668");
|
|
131
131
|
let app = (0, import_express.default)();
|
|
132
132
|
if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
|
|
133
|
-
log2.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
|
|
133
|
+
await log2.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
|
|
134
134
|
app.use(import_express.default.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
|
|
135
135
|
}
|
|
136
136
|
app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
|
|
@@ -147,7 +147,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
147
147
|
let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
|
|
148
148
|
\u8BF7\u6C42\u8DEF\u5F84 = decodeURIComponent(\u8BF7\u6C42\u8DEF\u5F84);
|
|
149
149
|
let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
|
|
150
|
-
log2.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
150
|
+
await log2.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
151
151
|
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;
|
|
152
152
|
if (\u76EE\u6807\u63A5\u53E3 !== null) {
|
|
153
153
|
await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, { log: \u4E3Blog });
|
|
@@ -159,17 +159,17 @@ var \u670D\u52A1\u5668 = class {
|
|
|
159
159
|
res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
|
|
160
160
|
return;
|
|
161
161
|
} catch (e) {
|
|
162
|
-
log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
|
|
162
|
+
await log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
|
-
log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
|
|
165
|
+
await log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
|
|
166
166
|
res.status(404).end();
|
|
167
167
|
} catch (error) {
|
|
168
|
-
log2.error(error);
|
|
168
|
+
await log2.error(error);
|
|
169
169
|
res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
|
|
170
170
|
} finally {
|
|
171
171
|
let \u8017\u65F6ms = Date.now() - \u5F00\u59CB\u65F6\u95F4;
|
|
172
|
-
\u4E3Blog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
|
|
172
|
+
await \u4E3Blog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
|
|
173
173
|
}
|
|
174
174
|
}
|
|
175
175
|
async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
|
|
@@ -179,11 +179,11 @@ var \u670D\u52A1\u5668 = class {
|
|
|
179
179
|
let \u7ED3\u679C\u8FD4\u56DE\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8FD4\u56DE\u5668();
|
|
180
180
|
let \u603B\u5F00\u59CB = Date.now();
|
|
181
181
|
let \u5F00\u59CB = Date.now();
|
|
182
|
-
log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
|
|
182
|
+
await log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
|
|
183
183
|
let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
184
184
|
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);
|
|
185
185
|
let \u63A5\u53E3\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
186
|
-
log2.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
|
|
186
|
+
await log2.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
|
|
187
187
|
\u5F00\u59CB = Date.now();
|
|
188
188
|
let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
|
|
189
189
|
let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
|
|
@@ -195,61 +195,61 @@ var \u670D\u52A1\u5668 = class {
|
|
|
195
195
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
196
196
|
} else {
|
|
197
197
|
let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
|
|
198
|
-
log2.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
|
|
199
|
-
log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
200
|
-
log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
198
|
+
await log2.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
|
|
199
|
+
await log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
200
|
+
await log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
201
201
|
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
|
|
202
202
|
}
|
|
203
203
|
let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
204
|
-
log2.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
|
|
205
|
-
log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
|
|
204
|
+
await log2.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
|
|
205
|
+
await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
|
|
206
206
|
\u5F00\u59CB = Date.now();
|
|
207
207
|
await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
|
|
208
208
|
let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
209
|
-
log2.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
|
|
209
|
+
await log2.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
|
|
210
210
|
let \u603B\u8017\u65F6 = Date.now() - \u603B\u5F00\u59CB;
|
|
211
|
-
log2.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
|
|
211
|
+
await log2.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
|
|
212
212
|
}
|
|
213
213
|
async \u521D\u59CB\u5316WebSocket(server) {
|
|
214
214
|
let wss = new import_ws2.WebSocketServer({ server });
|
|
215
215
|
let logBase = await this.log;
|
|
216
216
|
wss.on("listening", async () => {
|
|
217
217
|
let log2 = logBase;
|
|
218
|
-
log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
|
|
218
|
+
await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
|
|
219
219
|
});
|
|
220
220
|
wss.on("error", async (err) => {
|
|
221
221
|
let log2 = logBase;
|
|
222
|
-
log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
|
|
222
|
+
await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
|
|
223
223
|
});
|
|
224
224
|
wss.on("connection", async (ws, req) => {
|
|
225
225
|
let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
226
|
-
log2.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
226
|
+
await log2.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
227
227
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
228
228
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
229
|
-
log2.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
229
|
+
await log2.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
230
230
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
231
231
|
}
|
|
232
|
-
log2.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
232
|
+
await log2.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
233
233
|
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
234
234
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
235
235
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
236
|
-
log2.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
236
|
+
await log2.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
237
237
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
238
238
|
}
|
|
239
239
|
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
240
|
-
log2.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
240
|
+
await log2.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
241
241
|
ws.on("close", async () => {
|
|
242
|
-
log2.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
242
|
+
await log2.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
243
243
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
244
244
|
});
|
|
245
245
|
ws.on("error", async (err) => {
|
|
246
|
-
log2.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
246
|
+
await log2.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
247
247
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
248
248
|
});
|
|
249
249
|
});
|
|
250
250
|
}
|
|
251
251
|
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, code, reason) {
|
|
252
|
-
log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
|
|
252
|
+
await log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
|
|
253
253
|
ws.close(code, reason);
|
|
254
254
|
}
|
|
255
255
|
\u83B7\u53D6\u672C\u5730\u5730\u5740() {
|
|
@@ -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-
|
|
3
|
+
import { 接 as ______, a as ______$1, l as ____Base, 空 as ___, b as __, 常 as _______, q as __________, r as __________$1 } from '../interface-base-xfTkYYz8.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-
|
|
2
|
+
import { 接 as ______, a as ______$1, l as ____Base, 空 as ___, b as __, 常 as _______, q as __________, r as __________$1 } from '../interface-base-xfTkYYz8.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-
|
|
2
|
+
import { 接 as ______, a as ______$1, l as ____Base, 空 as ___, b as __, y as ___________, q as __________, r as __________$1 } from '../interface-base-xfTkYYz8.cjs';
|
|
3
3
|
import { 常用返回器 as _____ } from '../interface/interface-retuen.cjs';
|
|
4
4
|
import '@lsby/ts-fp-data';
|
|
5
5
|
import 'express';
|
|
@@ -9,7 +9,7 @@ var \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
9
9
|
constructor() {
|
|
10
10
|
super(zod\u7C7B\u578B\u8868\u793A, async (req, res, \u9644\u52A0\u53C2\u6570) => {
|
|
11
11
|
let log = \u9644\u52A0\u53C2\u6570.log.extend("\u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6");
|
|
12
|
-
log.debug(req.headers);
|
|
12
|
+
await log.debug(req.headers);
|
|
13
13
|
return {};
|
|
14
14
|
});
|
|
15
15
|
}
|