@lsby/net-core 0.7.27 → 0.7.28
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 +12 -12
- package/dist/bin/gen-api-type/index.cjs +12 -12
- package/dist/bin/gen-test/bin.cjs +12 -12
- package/dist/bin/gen-test/index.cjs +12 -12
- package/dist/cjs/action/action.bak.cjs +2 -2
- 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 +12 -12
- package/dist/cjs/bin/gen-api-type/index.cjs +12 -12
- package/dist/cjs/bin/gen-test/bin.cjs +12 -12
- package/dist/cjs/bin/gen-test/index.cjs +12 -12
- package/dist/cjs/index.cjs +74 -92
- package/dist/cjs/index.d.cts +0 -1
- package/dist/cjs/interface/interface-logic.cjs +4 -4
- package/dist/cjs/plugin/extend/custom-data.cjs +1 -1
- package/dist/cjs/plugin/extend/json.cjs +3 -3
- package/dist/cjs/plugin/extend/log-headers.cjs +1 -1
- package/dist/cjs/plugin/extend/query.cjs +3 -3
- package/dist/cjs/plugin/extend/urlencoded.cjs +1 -1
- package/dist/cjs/plugin/extend/web-socket.cjs +7 -7
- package/dist/cjs/server/server.cjs +19 -18
- package/dist/esm/action/action.bak.js +2 -2
- 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-E3Q2IM3N.js → chunk-2ZZ7CFND.js} +1 -1
- package/dist/esm/{chunk-MCQJIHER.js → chunk-4POMXQ7K.js} +12 -12
- package/dist/esm/{chunk-AY6KWNWX.js → chunk-BJUUGCWM.js} +3 -3
- package/dist/esm/{chunk-XYV4EYHS.js → chunk-BRKIPTOQ.js} +4 -4
- package/dist/esm/{chunk-H4DSQ43S.js → chunk-J3NG7DBJ.js} +7 -7
- package/dist/esm/{chunk-XRRSYNTD.js → chunk-JLDRKJBS.js} +19 -18
- package/dist/esm/{chunk-UKAZDGUR.js → chunk-LUQFJIZQ.js} +11 -11
- package/dist/esm/{chunk-AFWSZAXR.js → chunk-NI676K3Z.js} +12 -12
- package/dist/esm/{chunk-DEYULWUL.js → chunk-REFLUHAF.js} +1 -1
- package/dist/esm/{chunk-GMYXAJS3.js → chunk-RPDD2QLE.js} +3 -3
- package/dist/esm/{chunk-7MHKNSNT.js → chunk-TUKBYYRK.js} +1 -1
- package/dist/esm/index.d.ts +0 -1
- package/dist/esm/index.js +10 -14
- package/dist/esm/interface/interface-logic.js +1 -1
- package/dist/esm/plugin/extend/custom-data.js +1 -1
- package/dist/esm/plugin/extend/json.js +1 -1
- package/dist/esm/plugin/extend/log-headers.js +1 -1
- package/dist/esm/plugin/extend/query.js +1 -1
- package/dist/esm/plugin/extend/urlencoded.js +1 -1
- package/dist/esm/plugin/extend/web-socket.js +1 -1
- package/dist/esm/server/server.js +1 -1
- package/package.json +3 -3
- package/dist/cjs/plugin/extend/chinese-path.cjs +0 -58
- package/dist/cjs/plugin/extend/chinese-path.d.cts +0 -15
- package/dist/esm/chunk-4BFNDHRC.js +0 -22
- package/dist/esm/plugin/extend/chinese-path.d.ts +0 -15
- package/dist/esm/plugin/extend/chinese-path.js +0 -7
|
@@ -53,7 +53,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
53
53
|
async \u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
|
|
54
54
|
let \u65E5\u5FD7\u5BF9\u8C61 = \u8BF7\u6C42\u9644\u52A0\u53C2\u6570.log;
|
|
55
55
|
let \u63D2\u4EF6\u4EEC = this.\u83B7\u5F97\u63D2\u4EF6\u4EEC();
|
|
56
|
-
|
|
56
|
+
\u65E5\u5FD7\u5BF9\u8C61.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63D2\u4EF6\u4EEC.length);
|
|
57
57
|
let \u6240\u6709\u63D2\u4EF6\u7ED3\u679C = [];
|
|
58
58
|
for (let \u63D2\u4EF6 of \u63D2\u4EF6\u4EEC) {
|
|
59
59
|
let \u63D2\u4EF6\u672C\u4F53 = await \u63D2\u4EF6.run();
|
|
@@ -61,16 +61,16 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
61
61
|
\u6240\u6709\u63D2\u4EF6\u7ED3\u679C.push(\u63D2\u4EF6\u8FD4\u56DE);
|
|
62
62
|
}
|
|
63
63
|
let \u5408\u5E76\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => ({ ...s, ...a }), {});
|
|
64
|
-
|
|
64
|
+
\u65E5\u5FD7\u5BF9\u8C61.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
|
|
65
65
|
return \u5408\u5E76\u7ED3\u679C;
|
|
66
66
|
}
|
|
67
67
|
async \u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570) {
|
|
68
68
|
let log = \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570.log.extend("\u63A5\u53E3\u903B\u8F91");
|
|
69
69
|
let \u6E05\u7406\u51FD\u6570 = this.\u83B7\u5F97\u6E05\u7406\u51FD\u6570?.();
|
|
70
70
|
try {
|
|
71
|
-
|
|
71
|
+
log.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
|
|
72
72
|
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);
|
|
73
|
-
|
|
73
|
+
log.debug("\u63A5\u53E3\u5B9E\u73B0\u6267\u884C\u5B8C\u6BD5");
|
|
74
74
|
let \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => ({ ...\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...a }));
|
|
75
75
|
if (\u6E05\u7406\u51FD\u6570 !== void 0) {
|
|
76
76
|
let \u4E0A\u5C42\u6DF7\u5408\u7ED3\u679C = \u6700\u7EC8\u7ED3\u679C.isRight() === true ? \u6700\u7EC8\u7ED3\u679C.assertRight().getRight() : \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570;
|
|
@@ -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
|
-
|
|
106
|
+
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
|
-
|
|
84
|
+
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
|
-
|
|
87
|
+
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
|
-
|
|
90
|
+
log.debug("\u6210\u529F\u89E3\u6790 JSON");
|
|
91
91
|
return parseResult.data;
|
|
92
92
|
});
|
|
93
93
|
}
|
|
@@ -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
|
-
|
|
48
|
+
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
|
-
|
|
68
|
+
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
|
-
|
|
71
|
+
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
|
-
|
|
74
|
+
log.debug("\u6210\u529F\u89E3\u6790 GET \u53C2\u6570");
|
|
75
75
|
return parseResult.data;
|
|
76
76
|
});
|
|
77
77
|
}
|
|
@@ -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
|
-
|
|
125
|
+
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;
|
|
@@ -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
|
-
|
|
119
|
+
log2.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
120
120
|
if (typeof wsId !== "string") {
|
|
121
|
-
|
|
121
|
+
log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket Id");
|
|
122
122
|
return { ws\u64CD\u4F5C: null };
|
|
123
123
|
}
|
|
124
|
-
|
|
124
|
+
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,11 +129,11 @@ 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
|
-
|
|
132
|
+
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
|
-
|
|
136
|
+
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) => {
|
|
@@ -147,11 +147,11 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
147
147
|
});
|
|
148
148
|
},
|
|
149
149
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
150
|
-
|
|
150
|
+
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
|
-
|
|
154
|
+
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
|
}
|
|
@@ -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
|
-
|
|
133
|
+
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));
|
|
@@ -145,8 +145,9 @@ var \u670D\u52A1\u5668 = class {
|
|
|
145
145
|
let \u5F00\u59CB\u65F6\u95F4 = Date.now();
|
|
146
146
|
try {
|
|
147
147
|
let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
|
|
148
|
+
\u8BF7\u6C42\u8DEF\u5F84 = decodeURIComponent(\u8BF7\u6C42\u8DEF\u5F84);
|
|
148
149
|
let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
|
|
149
|
-
|
|
150
|
+
log2.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
150
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;
|
|
151
152
|
if (\u76EE\u6807\u63A5\u53E3 !== null) {
|
|
152
153
|
await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, { log: \u4E3Blog });
|
|
@@ -158,17 +159,17 @@ var \u670D\u52A1\u5668 = class {
|
|
|
158
159
|
res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
|
|
159
160
|
return;
|
|
160
161
|
} catch (e) {
|
|
161
|
-
|
|
162
|
+
log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
|
|
162
163
|
}
|
|
163
164
|
}
|
|
164
|
-
|
|
165
|
+
log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
|
|
165
166
|
res.status(404).end();
|
|
166
167
|
} catch (error) {
|
|
167
|
-
|
|
168
|
+
log2.error(error);
|
|
168
169
|
res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
|
|
169
170
|
} finally {
|
|
170
171
|
let \u8017\u65F6ms = Date.now() - \u5F00\u59CB\u65F6\u95F4;
|
|
171
|
-
|
|
172
|
+
\u4E3Blog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
|
|
172
173
|
}
|
|
173
174
|
}
|
|
174
175
|
async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
|
|
@@ -178,11 +179,11 @@ var \u670D\u52A1\u5668 = class {
|
|
|
178
179
|
let \u7ED3\u679C\u8FD4\u56DE\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8FD4\u56DE\u5668();
|
|
179
180
|
let \u603B\u5F00\u59CB = Date.now();
|
|
180
181
|
let \u5F00\u59CB = Date.now();
|
|
181
|
-
|
|
182
|
+
log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
|
|
182
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);
|
|
183
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);
|
|
184
185
|
let \u63A5\u53E3\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
185
|
-
|
|
186
|
+
log2.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
|
|
186
187
|
\u5F00\u59CB = Date.now();
|
|
187
188
|
let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
|
|
188
189
|
let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
|
|
@@ -194,31 +195,31 @@ var \u670D\u52A1\u5668 = class {
|
|
|
194
195
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
195
196
|
} else {
|
|
196
197
|
let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
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);
|
|
200
201
|
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
|
|
201
202
|
}
|
|
202
203
|
let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
203
|
-
|
|
204
|
-
|
|
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)));
|
|
205
206
|
\u5F00\u59CB = Date.now();
|
|
206
207
|
await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
|
|
207
208
|
let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
208
|
-
|
|
209
|
+
log2.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
|
|
209
210
|
let \u603B\u8017\u65F6 = Date.now() - \u603B\u5F00\u59CB;
|
|
210
|
-
|
|
211
|
+
log2.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
|
|
211
212
|
}
|
|
212
213
|
async \u521D\u59CB\u5316WebSocket(server) {
|
|
213
214
|
let wss = new import_ws2.WebSocketServer({ server });
|
|
214
215
|
let logBase = await this.log;
|
|
215
216
|
wss.on("listening", async () => {
|
|
216
217
|
let log2 = logBase;
|
|
217
|
-
|
|
218
|
+
log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
|
|
218
219
|
});
|
|
219
220
|
wss.on("error", async (err) => {
|
|
220
221
|
let log2 = logBase;
|
|
221
|
-
|
|
222
|
+
log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
|
|
222
223
|
});
|
|
223
224
|
wss.on("connection", async (ws, req) => {
|
|
224
225
|
let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
@@ -248,7 +249,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
248
249
|
});
|
|
249
250
|
}
|
|
250
251
|
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, code, reason) {
|
|
251
|
-
|
|
252
|
+
log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
|
|
252
253
|
ws.close(code, reason);
|
|
253
254
|
}
|
|
254
255
|
\u83B7\u53D6\u672C\u5730\u5730\u5740() {
|
|
@@ -41,7 +41,7 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
41
41
|
let \u6240\u6709\u7ED3\u679C = await Promise.all(arr.map((a) => a.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570)));
|
|
42
42
|
let \u9519\u8BEF = \u6240\u6709\u7ED3\u679C.filter((a) => a.isLeft())[0] ?? null;
|
|
43
43
|
if (\u9519\u8BEF !== null) return \u9519\u8BEF;
|
|
44
|
-
let \u6B63\u786E\u7ED3\u679C\u5408\u5E76 = \u6240\u6709\u7ED3\u679C.map((a) => a.assertRight().getRight()).reduce((s, a) =>
|
|
44
|
+
let \u6B63\u786E\u7ED3\u679C\u5408\u5E76 = \u6240\u6709\u7ED3\u679C.map((a) => a.assertRight().getRight()).reduce((s, a) => ({ ...s, ...a }), {});
|
|
45
45
|
return new Right(await f(\u6B63\u786E\u7ED3\u679C\u5408\u5E76));
|
|
46
46
|
});
|
|
47
47
|
}
|
|
@@ -95,7 +95,7 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
95
95
|
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
96
96
|
if (\u6211\u7684\u7ED3\u679C.isLeft()) return new Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
97
97
|
let \u5BF9\u65B9\u7ED3\u679C = await b.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0({ ...\u53C2\u6570, ...\u6211\u7684\u7ED3\u679C.assertRight().getRight() });
|
|
98
|
-
return \u5BF9\u65B9\u7ED3\u679C.map((a) =>
|
|
98
|
+
return \u5BF9\u65B9\u7ED3\u679C.map((a) => ({ ...a, ...\u6211\u7684\u7ED3\u679C.assertRight().getRight() }));
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
101
|
// ================================= 映射 =================================
|
|
@@ -11,7 +11,7 @@ var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
11
11
|
constructor(t, data) {
|
|
12
12
|
super(t, async (_res, _req, \u9644\u52A0\u53C2\u6570) => {
|
|
13
13
|
let log = \u9644\u52A0\u53C2\u6570.log.extend("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6");
|
|
14
|
-
|
|
14
|
+
log.debug("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6\u8FD0\u884C, \u7ED3\u679C: %o", data);
|
|
15
15
|
return data;
|
|
16
16
|
});
|
|
17
17
|
}
|
|
@@ -14,21 +14,21 @@ function \u68C0\u67E5\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA(\u6E90\u6587\u4EF6) {
|
|
|
14
14
|
}
|
|
15
15
|
async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84) {
|
|
16
16
|
let log = new Log("@lsby:net-core").extend("gen-api-type");
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
log.debug("\u5F00\u59CB\u751F\u6210\u7C7B\u578B...");
|
|
18
|
+
log.debug(`tsconfig\u8DEF\u5F84: ${tsconfig\u8DEF\u5F84}`);
|
|
19
|
+
log.debug(`\u76EE\u6807\u8DEF\u5F84: ${\u76EE\u6807\u8DEF\u5F84}`);
|
|
20
|
+
log.debug(`\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84: ${\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84}`);
|
|
21
21
|
let tsconfig\u5185\u5BB9 = ts.parseConfigFileTextToJson(tsconfig\u8DEF\u5F84, fs.readFileSync(tsconfig\u8DEF\u5F84, "utf8"));
|
|
22
22
|
let tsconfig\u5185\u5BB9\u9519\u8BEF = tsconfig\u5185\u5BB9.error ?? null;
|
|
23
23
|
if (tsconfig\u5185\u5BB9\u9519\u8BEF !== null) {
|
|
24
|
-
|
|
24
|
+
log.error("\u65E0\u6CD5\u89E3\u6790 tsconfig.json: " + tsconfig\u5185\u5BB9\u9519\u8BEF.messageText);
|
|
25
25
|
throw new Error("\u65E0\u6CD5\u89E3\u6790 tsconfig.json");
|
|
26
26
|
}
|
|
27
27
|
let \u89E3\u6790\u540E\u7684tsconfig = ts.parseJsonConfigFileContent(tsconfig\u5185\u5BB9.config, ts.sys, path.resolve(tsconfig\u8DEF\u5F84, ".."));
|
|
28
|
-
|
|
28
|
+
log.debug("\u6210\u529F\u89E3\u6790 tsconfig \u6587\u4EF6...");
|
|
29
29
|
let \u9879\u76EE\u4E3B\u673A = ts.createCompilerHost(\u89E3\u6790\u540E\u7684tsconfig.options);
|
|
30
30
|
let \u9879\u76EE = ts.createProgram(\u89E3\u6790\u540E\u7684tsconfig.fileNames, \u89E3\u6790\u540E\u7684tsconfig.options, \u9879\u76EE\u4E3B\u673A);
|
|
31
|
-
|
|
31
|
+
log.debug("\u6210\u529F\u8BFB\u53D6\u9879\u76EE...");
|
|
32
32
|
let \u6240\u6709\u6E90\u6587\u4EF6 = \u9879\u76EE.getSourceFiles();
|
|
33
33
|
let \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC = \u6240\u6709\u6E90\u6587\u4EF6.filter((\u6E90\u6587\u4EF6) => {
|
|
34
34
|
let \u6E90\u6587\u4EF6\u8DEF\u5F84 = path.normalize(\u6E90\u6587\u4EF6.fileName);
|
|
@@ -37,7 +37,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
37
37
|
if (\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA === false) return false;
|
|
38
38
|
return true;
|
|
39
39
|
});
|
|
40
|
-
|
|
40
|
+
log.debug(`\u7B5B\u9009\u51FA ${\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.length} \u4E2A\u76F8\u5173\u6E90\u6587\u4EF6`);
|
|
41
41
|
let \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC = \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.map((a) => {
|
|
42
42
|
let \u4EE3\u7801 = `
|
|
43
43
|
import {
|
|
@@ -170,19 +170,19 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
170
170
|
}
|
|
171
171
|
}
|
|
172
172
|
let \u6700\u7EC8\u7ED3\u679C_JSON = Array.from(new Set(JSON\u7ED3\u679C.filter((a) => a !== "any" && a !== "never" && a !== "unknown")));
|
|
173
|
-
|
|
173
|
+
log.debug(`\u6700\u7EC8\u7B5B\u9009\u51FA ${\u6700\u7EC8\u7ED3\u679C_JSON.length} \u4E2Ajson\u63A5\u53E3\u7C7B\u578B`);
|
|
174
174
|
let \u6700\u7EC8\u7ED3\u679C_\u5BFC\u51FA\u7C7B\u578B = Array.from(new Set(\u5BFC\u51FA\u7C7B\u578B.filter((a) => a !== "any" && a !== "never" && a !== "unknown")));
|
|
175
|
-
|
|
175
|
+
log.debug(`\u6700\u7EC8\u7B5B\u9009\u51FA ${\u6700\u7EC8\u7ED3\u679C_\u5BFC\u51FA\u7C7B\u578B.length} \u4E2A\u5BFC\u51FA\u7C7B\u578B`);
|
|
176
176
|
let \u6700\u7EC8\u4EE3\u7801 = [
|
|
177
177
|
`// \u8BE5\u6587\u4EF6\u7531\u811A\u672C\u81EA\u52A8\u751F\u6210, \u8BF7\u52FF\u4FEE\u6539.`,
|
|
178
178
|
...\u6700\u7EC8\u7ED3\u679C_\u5BFC\u51FA\u7C7B\u578B,
|
|
179
179
|
`export type InterfaceType = [${\u6700\u7EC8\u7ED3\u679C_JSON.join(",")}]`
|
|
180
180
|
];
|
|
181
|
-
|
|
181
|
+
log.debug("\u6700\u7EC8\u4EE3\u7801\u751F\u6210\u5B8C\u6210");
|
|
182
182
|
let \u8F93\u51FA\u6587\u4EF6\u5939 = path.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84);
|
|
183
183
|
if (fs.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939) === false) fs.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });
|
|
184
184
|
fs.writeFileSync(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, \u6700\u7EC8\u4EE3\u7801.join("\n"));
|
|
185
|
-
|
|
185
|
+
log.debug(`\u8F93\u51FA\u6587\u4EF6\u5199\u5165\u5B8C\u6210: ${\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84}`);
|
|
186
186
|
}
|
|
187
187
|
|
|
188
188
|
export {
|
|
@@ -13,13 +13,13 @@ var GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
13
13
|
constructor(t) {
|
|
14
14
|
super(t, async (req, _res, \u9644\u52A0\u53C2\u6570) => {
|
|
15
15
|
let log = \u9644\u52A0\u53C2\u6570.log.extend("GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6");
|
|
16
|
-
|
|
16
|
+
log.debug("\u51C6\u5907\u89E3\u6790 GET \u53C2\u6570\uFF1A%o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.query)));
|
|
17
17
|
let parseResult = t.safeParse(req.query);
|
|
18
18
|
if (parseResult.success === false) {
|
|
19
|
-
|
|
19
|
+
log.error("\u89E3\u6790 GET \u53C2\u6570\u5931\u8D25\uFF1A%o", parseResult.error);
|
|
20
20
|
throw new Error(format("\u89E3\u6790 GET \u53C2\u6570\u5931\u8D25: %o", parseResult.error));
|
|
21
21
|
}
|
|
22
|
-
|
|
22
|
+
log.debug("\u6210\u529F\u89E3\u6790 GET \u53C2\u6570");
|
|
23
23
|
return parseResult.data;
|
|
24
24
|
});
|
|
25
25
|
}
|
|
@@ -28,7 +28,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
28
28
|
async \u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
|
|
29
29
|
let \u65E5\u5FD7\u5BF9\u8C61 = \u8BF7\u6C42\u9644\u52A0\u53C2\u6570.log;
|
|
30
30
|
let \u63D2\u4EF6\u4EEC = this.\u83B7\u5F97\u63D2\u4EF6\u4EEC();
|
|
31
|
-
|
|
31
|
+
\u65E5\u5FD7\u5BF9\u8C61.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63D2\u4EF6\u4EEC.length);
|
|
32
32
|
let \u6240\u6709\u63D2\u4EF6\u7ED3\u679C = [];
|
|
33
33
|
for (let \u63D2\u4EF6 of \u63D2\u4EF6\u4EEC) {
|
|
34
34
|
let \u63D2\u4EF6\u672C\u4F53 = await \u63D2\u4EF6.run();
|
|
@@ -36,16 +36,16 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
36
36
|
\u6240\u6709\u63D2\u4EF6\u7ED3\u679C.push(\u63D2\u4EF6\u8FD4\u56DE);
|
|
37
37
|
}
|
|
38
38
|
let \u5408\u5E76\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => ({ ...s, ...a }), {});
|
|
39
|
-
|
|
39
|
+
\u65E5\u5FD7\u5BF9\u8C61.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
|
|
40
40
|
return \u5408\u5E76\u7ED3\u679C;
|
|
41
41
|
}
|
|
42
42
|
async \u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570) {
|
|
43
43
|
let log = \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570.log.extend("\u63A5\u53E3\u903B\u8F91");
|
|
44
44
|
let \u6E05\u7406\u51FD\u6570 = this.\u83B7\u5F97\u6E05\u7406\u51FD\u6570?.();
|
|
45
45
|
try {
|
|
46
|
-
|
|
46
|
+
log.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
|
|
47
47
|
let \u5B9E\u73B0\u7ED3\u679C = await this.\u5B9E\u73B0(\u5408\u5E76\u63D2\u4EF6\u7ED3\u679C, \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570);
|
|
48
|
-
|
|
48
|
+
log.debug("\u63A5\u53E3\u5B9E\u73B0\u6267\u884C\u5B8C\u6BD5");
|
|
49
49
|
let \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => ({ ...\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...a }));
|
|
50
50
|
if (\u6E05\u7406\u51FD\u6570 !== void 0) {
|
|
51
51
|
let \u4E0A\u5C42\u6DF7\u5408\u7ED3\u679C = \u6700\u7EC8\u7ED3\u679C.isRight() === true ? \u6700\u7EC8\u7ED3\u679C.assertRight().getRight() : \u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570;
|
|
@@ -24,12 +24,12 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
24
24
|
let WebSocket\u7BA1\u7406\u5668 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
|
|
25
25
|
let ws\u53E5\u67C4 = null;
|
|
26
26
|
let wsId = req.headers["ws-client-id"];
|
|
27
|
-
|
|
27
|
+
log.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
28
28
|
if (typeof wsId !== "string") {
|
|
29
|
-
|
|
29
|
+
log.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket Id");
|
|
30
30
|
return { ws\u64CD\u4F5C: null };
|
|
31
31
|
}
|
|
32
|
-
|
|
32
|
+
log.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
|
|
33
33
|
return {
|
|
34
34
|
ws\u64CD\u4F5C: {
|
|
35
35
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
@@ -37,11 +37,11 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
37
37
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u5668.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
38
38
|
}
|
|
39
39
|
if (ws\u53E5\u67C4 === null) {
|
|
40
|
-
|
|
40
|
+
log.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
if (ws\u53E5\u67C4.readyState !== WebSocket.OPEN) {
|
|
44
|
-
|
|
44
|
+
log.warn("WebSocket \u672A\u6253\u5F00\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F", { wsId });
|
|
45
45
|
return;
|
|
46
46
|
}
|
|
47
47
|
await new Promise((resolve, reject) => {
|
|
@@ -55,11 +55,11 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
55
55
|
});
|
|
56
56
|
},
|
|
57
57
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
58
|
-
|
|
58
|
+
log.debug("\u5173\u95ED WebSocket \u8FDE\u63A5", { wsId });
|
|
59
59
|
WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(wsId);
|
|
60
60
|
},
|
|
61
61
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u6E05\u7406\u51FD\u6570) {
|
|
62
|
-
|
|
62
|
+
log.debug("\u8BBE\u7F6E WebSocket \u6E05\u7406\u51FD\u6570", { wsId });
|
|
63
63
|
await WebSocket\u7BA1\u7406\u5668.\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(wsId, \u6E05\u7406\u51FD\u6570);
|
|
64
64
|
}
|
|
65
65
|
}
|
|
@@ -23,7 +23,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
23
23
|
let log = (await this.log).extend("\u670D\u52A1\u5668");
|
|
24
24
|
let app = express();
|
|
25
25
|
if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
|
|
26
|
-
|
|
26
|
+
log.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
|
|
27
27
|
app.use(express.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
|
|
28
28
|
}
|
|
29
29
|
app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
|
|
@@ -38,8 +38,9 @@ var \u670D\u52A1\u5668 = class {
|
|
|
38
38
|
let \u5F00\u59CB\u65F6\u95F4 = Date.now();
|
|
39
39
|
try {
|
|
40
40
|
let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
|
|
41
|
+
\u8BF7\u6C42\u8DEF\u5F84 = decodeURIComponent(\u8BF7\u6C42\u8DEF\u5F84);
|
|
41
42
|
let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
|
|
42
|
-
|
|
43
|
+
log.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
43
44
|
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;
|
|
44
45
|
if (\u76EE\u6807\u63A5\u53E3 !== null) {
|
|
45
46
|
await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, { log: \u4E3Blog });
|
|
@@ -51,17 +52,17 @@ var \u670D\u52A1\u5668 = class {
|
|
|
51
52
|
res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
|
|
52
53
|
return;
|
|
53
54
|
} catch (e) {
|
|
54
|
-
|
|
55
|
+
log.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
|
|
55
56
|
}
|
|
56
57
|
}
|
|
57
|
-
|
|
58
|
+
log.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
|
|
58
59
|
res.status(404).end();
|
|
59
60
|
} catch (error) {
|
|
60
|
-
|
|
61
|
+
log.error(error);
|
|
61
62
|
res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
|
|
62
63
|
} finally {
|
|
63
64
|
let \u8017\u65F6ms = Date.now() - \u5F00\u59CB\u65F6\u95F4;
|
|
64
|
-
|
|
65
|
+
\u4E3Blog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
|
|
@@ -71,11 +72,11 @@ var \u670D\u52A1\u5668 = class {
|
|
|
71
72
|
let \u7ED3\u679C\u8FD4\u56DE\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8FD4\u56DE\u5668();
|
|
72
73
|
let \u603B\u5F00\u59CB = Date.now();
|
|
73
74
|
let \u5F00\u59CB = Date.now();
|
|
74
|
-
|
|
75
|
+
log.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
|
|
75
76
|
let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
76
77
|
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);
|
|
77
78
|
let \u63A5\u53E3\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
78
|
-
|
|
79
|
+
log.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
|
|
79
80
|
\u5F00\u59CB = Date.now();
|
|
80
81
|
let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
|
|
81
82
|
let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
|
|
@@ -87,31 +88,31 @@ var \u670D\u52A1\u5668 = class {
|
|
|
87
88
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
88
89
|
} else {
|
|
89
90
|
let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
log.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
|
|
92
|
+
log.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
93
|
+
log.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
93
94
|
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
|
|
94
95
|
}
|
|
95
96
|
let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
96
|
-
|
|
97
|
-
|
|
97
|
+
log.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
|
|
98
|
+
log.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
|
|
98
99
|
\u5F00\u59CB = Date.now();
|
|
99
100
|
await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
|
|
100
101
|
let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
101
|
-
|
|
102
|
+
log.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
|
|
102
103
|
let \u603B\u8017\u65F6 = Date.now() - \u603B\u5F00\u59CB;
|
|
103
|
-
|
|
104
|
+
log.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
|
|
104
105
|
}
|
|
105
106
|
async \u521D\u59CB\u5316WebSocket(server) {
|
|
106
107
|
let wss = new WebSocketServer({ server });
|
|
107
108
|
let logBase = await this.log;
|
|
108
109
|
wss.on("listening", async () => {
|
|
109
110
|
let log = logBase;
|
|
110
|
-
|
|
111
|
+
log.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
|
|
111
112
|
});
|
|
112
113
|
wss.on("error", async (err) => {
|
|
113
114
|
let log = logBase;
|
|
114
|
-
|
|
115
|
+
log.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
|
|
115
116
|
});
|
|
116
117
|
wss.on("connection", async (ws, req) => {
|
|
117
118
|
let log = logBase.extend(short().new()).extend("WebSocket");
|
|
@@ -141,7 +142,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
141
142
|
});
|
|
142
143
|
}
|
|
143
144
|
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, code, reason) {
|
|
144
|
-
|
|
145
|
+
log.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
|
|
145
146
|
ws.close(code, reason);
|
|
146
147
|
}
|
|
147
148
|
\u83B7\u53D6\u672C\u5730\u5730\u5740() {
|