@lsby/net-core 0.3.39 → 0.3.41
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-list/bin.cjs +27 -27
- package/dist/bin/gen-list/index.cjs +24 -24
- package/dist/bin/gen-test/bin.cjs +27 -27
- package/dist/bin/gen-test/index.cjs +24 -24
- package/dist/bin/gen-type/addition.d.cts +1 -1
- package/dist/bin/gen-type/bin.cjs +27 -27
- package/dist/bin/gen-type/index.cjs +24 -24
- package/dist/cjs/action/action.cjs +9 -9
- package/dist/cjs/bin/gen-list/bin.cjs +27 -27
- package/dist/cjs/bin/gen-list/index.cjs +24 -24
- package/dist/cjs/bin/gen-test/bin.cjs +27 -27
- package/dist/cjs/bin/gen-test/index.cjs +24 -24
- package/dist/cjs/bin/gen-type/addition.d.cts +1 -1
- package/dist/cjs/bin/gen-type/bin.cjs +27 -27
- package/dist/cjs/bin/gen-type/index.cjs +24 -24
- package/dist/cjs/global/global.d.cts +1 -1
- package/dist/cjs/index.cjs +51 -54
- package/dist/cjs/interface/extend/json-base.cjs +6 -6
- package/dist/cjs/interface/extend/json-wrap.cjs +6 -6
- package/dist/cjs/interface/interface-test.cjs +1 -1
- package/dist/cjs/plugin/extend/chinese-path.cjs +2 -2
- package/dist/cjs/plugin/extend/chinese-path.d.cts +1 -1
- package/dist/cjs/plugin/extend/json.cjs +5 -5
- package/dist/cjs/plugin/extend/urlencoded.cjs +1 -1
- package/dist/cjs/plugin/extend/web-socket.cjs +12 -15
- package/dist/cjs/result/result.cjs +5 -5
- package/dist/cjs/server/server.cjs +17 -17
- package/dist/cjs/tools/tools.cjs +3 -3
- package/dist/esm/action/action.js +1 -1
- package/dist/esm/bin/gen-list/bin.js +4 -4
- package/dist/esm/bin/gen-list/index.js +1 -1
- package/dist/esm/bin/gen-test/bin.js +4 -4
- package/dist/esm/bin/gen-test/index.js +1 -1
- package/dist/esm/bin/gen-type/addition.d.ts +1 -1
- package/dist/esm/bin/gen-type/bin.js +4 -4
- package/dist/esm/bin/gen-type/index.js +1 -1
- package/dist/esm/{chunk-KW3M3VXP.js → chunk-3PONWJ35.js} +2 -2
- package/dist/esm/{chunk-BEJF4KW3.js → chunk-47GMSX5W.js} +17 -17
- package/dist/esm/{chunk-B6PEMS6O.js → chunk-5WR5VNYH.js} +9 -9
- package/dist/esm/{chunk-3DVNMDUP.js → chunk-64WWIZ43.js} +24 -24
- package/dist/esm/{chunk-EDWEBXKF.js → chunk-BVLGIDYF.js} +2 -2
- package/dist/esm/{chunk-PKE7OYIU.js → chunk-F6MKRRVF.js} +3 -3
- package/dist/esm/{chunk-MXNVJRJT.js → chunk-F7TZXXFE.js} +24 -24
- package/dist/esm/{chunk-4QVCUKEA.js → chunk-MUTTFLKG.js} +12 -15
- package/dist/esm/{chunk-25X7QZ6T.js → chunk-N7TPWCQ5.js} +1 -1
- package/dist/esm/{chunk-KZPZVZ2B.js → chunk-OOCVEPVP.js} +1 -1
- package/dist/esm/{chunk-43FMPMYJ.js → chunk-PVCULVI3.js} +2 -2
- package/dist/esm/{chunk-ES4NZ4EM.js → chunk-PVE5VI5K.js} +3 -3
- package/dist/esm/{chunk-QQG5MY3H.js → chunk-VBFA32JO.js} +3 -3
- package/dist/esm/{chunk-UABF4235.js → chunk-WIZEBP6C.js} +24 -24
- package/dist/esm/global/global.d.ts +1 -1
- package/dist/esm/index.js +13 -13
- package/dist/esm/interface/extend/json-base.js +3 -3
- package/dist/esm/interface/extend/json-wrap.js +3 -3
- package/dist/esm/interface/interface-test.js +1 -1
- package/dist/esm/plugin/extend/chinese-path.d.ts +1 -1
- package/dist/esm/plugin/extend/chinese-path.js +1 -1
- package/dist/esm/plugin/extend/json.js +2 -2
- package/dist/esm/plugin/extend/urlencoded.js +1 -1
- package/dist/esm/plugin/extend/web-socket.js +1 -1
- package/dist/esm/result/result.js +2 -2
- package/dist/esm/server/server.js +1 -1
- package/dist/esm/tools/tools.js +1 -1
- package/package.json +2 -2
package/dist/cjs/index.cjs
CHANGED
|
@@ -93,11 +93,11 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
93
93
|
*/
|
|
94
94
|
static \u5E76\u884C\u7EC4\u5408(arr, f) {
|
|
95
95
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
96
|
-
|
|
97
|
-
|
|
96
|
+
let \u6240\u6709\u7ED3\u679C = await Promise.all(arr.map((a) => a.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570)));
|
|
97
|
+
let \u9519\u8BEF = \u6240\u6709\u7ED3\u679C.filter((a) => a.isLeft())[0];
|
|
98
98
|
if (\u9519\u8BEF)
|
|
99
99
|
return \u9519\u8BEF;
|
|
100
|
-
|
|
100
|
+
let \u6B63\u786E\u7ED3\u679C\u5408\u5E76 = \u6240\u6709\u7ED3\u679C.map((a) => a.assertRight().getRight()).reduce((s, a) => Object.assign(s, a), {});
|
|
101
101
|
return new import_ts_fp_data.Right(await f(\u6B63\u786E\u7ED3\u679C\u5408\u5E76));
|
|
102
102
|
});
|
|
103
103
|
}
|
|
@@ -133,7 +133,7 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
133
133
|
*/
|
|
134
134
|
\u6D41\u5F0F\u7EC4\u5408(b) {
|
|
135
135
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
136
|
-
|
|
136
|
+
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
137
137
|
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
138
138
|
return new import_ts_fp_data.Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
139
139
|
return b.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u6211\u7684\u7ED3\u679C.assertRight().getRight());
|
|
@@ -149,17 +149,17 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
149
149
|
*/
|
|
150
150
|
\u6DF7\u5408\u7EC4\u5408(b) {
|
|
151
151
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
152
|
-
|
|
152
|
+
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
153
153
|
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
154
154
|
return new import_ts_fp_data.Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
155
|
-
|
|
155
|
+
let \u5BF9\u65B9\u7ED3\u679C = await b.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0({ ...\u53C2\u6570, ...\u6211\u7684\u7ED3\u679C.assertRight().getRight() });
|
|
156
156
|
return \u5BF9\u65B9\u7ED3\u679C.map((a) => Object.assign(a, \u6211\u7684\u7ED3\u679C.assertRight().getRight()));
|
|
157
157
|
});
|
|
158
158
|
}
|
|
159
159
|
// ================================= 映射 =================================
|
|
160
160
|
\u6620\u5C04\u7ED3\u679C(f) {
|
|
161
161
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
162
|
-
|
|
162
|
+
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
163
163
|
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
164
164
|
return new import_ts_fp_data.Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
165
165
|
return import_ts_fp_data.Either.pure(f(\u6211\u7684\u7ED3\u679C.assertRight().getRight()));
|
|
@@ -167,7 +167,7 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
167
167
|
}
|
|
168
168
|
\u6620\u5C04\u9519\u8BEF(f) {
|
|
169
169
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
170
|
-
|
|
170
|
+
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
171
171
|
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
172
172
|
return new import_ts_fp_data.Left(f(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft()));
|
|
173
173
|
return import_ts_fp_data.Either.pure(\u6211\u7684\u7ED3\u679C.assertRight().getRight());
|
|
@@ -182,7 +182,7 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
182
182
|
*/
|
|
183
183
|
\u7ED1\u5B9A(f) {
|
|
184
184
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
185
|
-
|
|
185
|
+
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
186
186
|
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
187
187
|
return new import_ts_fp_data.Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
188
188
|
return f(\u6211\u7684\u7ED3\u679C.assertRight().getRight()).\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
@@ -225,7 +225,7 @@ var Global = new import_ts_global.GlobalService([
|
|
|
225
225
|
|
|
226
226
|
// src/tools/tools.ts
|
|
227
227
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
228
|
-
|
|
228
|
+
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
229
229
|
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
230
230
|
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
231
231
|
return \u5185\u5BB9;
|
|
@@ -236,8 +236,8 @@ function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
|
236
236
|
if (Array.isArray(\u6570\u636E))
|
|
237
237
|
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
238
238
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
239
|
-
|
|
240
|
-
for (
|
|
239
|
+
let \u65B0\u6570\u636E = {};
|
|
240
|
+
for (let key in \u6570\u636E) {
|
|
241
241
|
if (\u6570\u636E.hasOwnProperty(key))
|
|
242
242
|
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
243
243
|
}
|
|
@@ -259,7 +259,7 @@ var \u6B63\u786EJSON\u7ED3\u679C = class extends \u6B63\u786E\u7ED3\u679C {
|
|
|
259
259
|
}
|
|
260
260
|
log = Global.getItem("log");
|
|
261
261
|
async run(req, res) {
|
|
262
|
-
|
|
262
|
+
let log = (await this.log).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
263
263
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
264
264
|
res.send(this.data);
|
|
265
265
|
}
|
|
@@ -283,7 +283,7 @@ var \u9519\u8BEFJSON\u7ED3\u679C = class extends \u9519\u8BEF\u7ED3\u679C {
|
|
|
283
283
|
}
|
|
284
284
|
log = Global.getItem("log");
|
|
285
285
|
async run(req, res) {
|
|
286
|
-
|
|
286
|
+
let log = (await this.log).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
287
287
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
288
288
|
res.send(this.data);
|
|
289
289
|
}
|
|
@@ -304,7 +304,7 @@ var JSON\u63A5\u53E3 = class extends \u63A5\u53E3 {
|
|
|
304
304
|
return this.\u63A5\u53E3\u7C7B\u578B\u63CF\u8FF0;
|
|
305
305
|
}
|
|
306
306
|
async \u63A5\u53E3\u5B9E\u73B0(\u53C2\u6570) {
|
|
307
|
-
|
|
307
|
+
let c = await this.\u4E1A\u52A1\u884C\u4E3A.\u8FD0\u884C\u4E1A\u52A1\u884C\u4E3A(\u53C2\u6570);
|
|
308
308
|
if (c.isLeft())
|
|
309
309
|
return new \u9519\u8BEFJSON\u7ED3\u679C(c.assertLeft().getLeft());
|
|
310
310
|
return new \u6B63\u786EJSON\u7ED3\u679C(c.assertRight().getRight());
|
|
@@ -362,7 +362,7 @@ var JSON\u72B6\u6001\u63A5\u53E3 = class extends \u63A5\u53E3 {
|
|
|
362
362
|
return this.\u63A5\u53E3\u7C7B\u578B\u63CF\u8FF0;
|
|
363
363
|
}
|
|
364
364
|
async \u63A5\u53E3\u5B9E\u73B0(\u53C2\u6570) {
|
|
365
|
-
|
|
365
|
+
let c = await this.\u4E1A\u52A1\u884C\u4E3A.\u8FD0\u884C\u4E1A\u52A1\u884C\u4E3A(\u53C2\u6570);
|
|
366
366
|
if (c.isLeft())
|
|
367
367
|
return new \u9519\u8BEFJSON\u7ED3\u679C({ status: "fail", data: c.assertLeft().getLeft() });
|
|
368
368
|
return new \u6B63\u786EJSON\u7ED3\u679C({ status: "success", data: c.assertRight().getRight() });
|
|
@@ -378,7 +378,7 @@ var \u63A5\u53E3\u6D4B\u8BD5 = class {
|
|
|
378
378
|
}
|
|
379
379
|
async \u8FD0\u884C() {
|
|
380
380
|
await this.\u524D\u7F6E\u5B9E\u73B0();
|
|
381
|
-
|
|
381
|
+
let \u4E2D\u7F6E\u7ED3\u679C = await this.\u4E2D\u7F6E\u5B9E\u73B0();
|
|
382
382
|
await this.\u540E\u7F6E\u5B9E\u73B0(\u4E2D\u7F6E\u7ED3\u679C);
|
|
383
383
|
}
|
|
384
384
|
};
|
|
@@ -406,8 +406,8 @@ var zod\u7C7B\u578B\u8868\u793A = import_zod2.z.object({});
|
|
|
406
406
|
var \u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
407
407
|
constructor() {
|
|
408
408
|
super(zod\u7C7B\u578B\u8868\u793A, async (request) => {
|
|
409
|
-
|
|
410
|
-
|
|
409
|
+
let url = new import_node_url.URL(request.url);
|
|
410
|
+
let pathname = url.pathname;
|
|
411
411
|
request.url = request.originalUrl = pathname.replace(pathname, decodeURIComponent(pathname));
|
|
412
412
|
return {};
|
|
413
413
|
});
|
|
@@ -428,14 +428,14 @@ var JSON\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
428
428
|
log = Global.getItem("log");
|
|
429
429
|
constructor(t, opt) {
|
|
430
430
|
super(t, async (req, res) => {
|
|
431
|
-
|
|
431
|
+
let log = (await this.log).extend("JSON\u89E3\u6790\u63D2\u4EF6");
|
|
432
432
|
await new Promise(
|
|
433
433
|
(pRes, _rej) => import_express.default.json(opt)(req, res, () => {
|
|
434
434
|
pRes(null);
|
|
435
435
|
})
|
|
436
436
|
);
|
|
437
437
|
await log.debug("\u51C6\u5907\u89E3\u6790 JSON\uFF1A%o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.body));
|
|
438
|
-
|
|
438
|
+
let parseResult = t.safeParse(req.body);
|
|
439
439
|
if (!parseResult.success) {
|
|
440
440
|
await log.err("\u89E3\u6790 JSON \u5931\u8D25\uFF1A%o", parseResult.error);
|
|
441
441
|
throw new Error((0, import_node_util.format)("\u89E3\u6790 JSON \u5931\u8D25: %O", parseResult.error));
|
|
@@ -457,7 +457,7 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
457
457
|
pRes(null);
|
|
458
458
|
})
|
|
459
459
|
);
|
|
460
|
-
|
|
460
|
+
let parseResult = t.safeParse(req.body);
|
|
461
461
|
if (!parseResult.success)
|
|
462
462
|
throw new Error((0, import_node_util2.format)("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %O", parseResult.error));
|
|
463
463
|
return parseResult.data;
|
|
@@ -477,30 +477,27 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
477
477
|
}).or(import_zod3.z.undefined())
|
|
478
478
|
}),
|
|
479
479
|
async (req, _res) => {
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
var ws\u53E5\u67C4 = null;
|
|
480
|
+
let wsId = req.headers["ws-client-id"];
|
|
481
|
+
let WebSocket\u7BA1\u7406\u80052 = await Global.getItem("WebSocket\u7BA1\u7406\u8005");
|
|
482
|
+
let ws\u53E5\u67C4 = null;
|
|
484
483
|
if (typeof wsId == "string")
|
|
485
484
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u80052.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
486
485
|
if (!ws\u53E5\u67C4)
|
|
487
486
|
return { ws\u64CD\u4F5C: void 0 };
|
|
488
|
-
|
|
487
|
+
let \u5B58\u5728\u7684ws\u53E5\u67C4 = ws\u53E5\u67C4;
|
|
489
488
|
return {
|
|
490
489
|
ws\u64CD\u4F5C: {
|
|
491
490
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
492
|
-
|
|
493
|
-
\u5B58\u5728\u7684ws\u53E5\u67C4.send(JSON.stringify(\u4FE1\u606F))
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
491
|
+
return new Promise((res, rej) => {
|
|
492
|
+
\u5B58\u5728\u7684ws\u53E5\u67C4.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
493
|
+
if (err)
|
|
494
|
+
return rej(err);
|
|
495
|
+
return res();
|
|
496
|
+
});
|
|
497
|
+
});
|
|
497
498
|
},
|
|
498
499
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
499
|
-
|
|
500
|
-
\u5B58\u5728\u7684ws\u53E5\u67C4.close();
|
|
501
|
-
} catch (e) {
|
|
502
|
-
await log.err(e);
|
|
503
|
-
}
|
|
500
|
+
\u5B58\u5728\u7684ws\u53E5\u67C4.close();
|
|
504
501
|
}
|
|
505
502
|
}
|
|
506
503
|
};
|
|
@@ -522,27 +519,27 @@ var \u670D\u52A1\u5668 = class {
|
|
|
522
519
|
}
|
|
523
520
|
log = Global.getItem("log");
|
|
524
521
|
async run() {
|
|
525
|
-
|
|
522
|
+
let app = (0, import_express3.default)();
|
|
526
523
|
app.use(async (req, res) => {
|
|
527
|
-
|
|
524
|
+
let log = (await this.log).extend("\u8BF7\u6C42").extend((0, import_short_uuid.default)().new());
|
|
528
525
|
try {
|
|
529
|
-
|
|
530
|
-
|
|
526
|
+
let \u8BF7\u6C42\u8DEF\u5F84 = req.path;
|
|
527
|
+
let \u8BF7\u6C42\u65B9\u6CD5 = req.method.toLowerCase();
|
|
531
528
|
await log.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
532
529
|
await log.debug("\u5C1D\u8BD5\u5339\u914D\u63A5\u53E3...");
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
return \u8BF7\u6C42\u8DEF\u5F84 == \u63A5\u53E3\u7C7B\
|
|
530
|
+
let \u76EE\u6807\u63A5\u53E3 = this.\u63A5\u53E3\u4EEC.find((\u63A5\u53E32) => {
|
|
531
|
+
let \u63A5\u53E3\u7C7B\u578B2 = \u63A5\u53E32.\u83B7\u5F97\u63A5\u53E3\u7C7B\u578B();
|
|
532
|
+
return \u8BF7\u6C42\u8DEF\u5F84 == \u63A5\u53E3\u7C7B\u578B2.\u83B7\u5F97\u8DEF\u5F84() && \u8BF7\u6C42\u65B9\u6CD5 == \u63A5\u53E3\u7C7B\u578B2.\u83B7\u5F97\u65B9\u6CD5();
|
|
536
533
|
});
|
|
537
534
|
if (\u76EE\u6807\u63A5\u53E3 != null) {
|
|
538
535
|
await log.debug("\u547D\u4E2D\u63A5\u53E3");
|
|
539
|
-
|
|
540
|
-
|
|
536
|
+
let \u63A5\u53E3\u7C7B\u578B2 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u7C7B\u578B();
|
|
537
|
+
let \u63A5\u53E3\u63D2\u4EF6 = \u63A5\u53E3\u7C7B\u578B2.\u83B7\u5F97\u63D2\u4EF6\u4EEC();
|
|
541
538
|
await log.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63A5\u53E3\u63D2\u4EF6.length);
|
|
542
|
-
|
|
539
|
+
let \u63D2\u4EF6\u7ED3\u679C = (await Promise.all(\u63A5\u53E3\u63D2\u4EF6.map(async (\u63D2\u4EF62) => await (await \u63D2\u4EF62.run()).\u83B7\u5F97\u5B9E\u73B0()(req, res)))).reduce((s, a) => Object.assign(s, a), {});
|
|
543
540
|
await log.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
|
|
544
541
|
await log.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u903B\u8F91...");
|
|
545
|
-
|
|
542
|
+
let \u63A5\u53E3\u7ED3\u679C = await \u76EE\u6807\u63A5\u53E3.\u63A5\u53E3\u5B9E\u73B0(\u63D2\u4EF6\u7ED3\u679C);
|
|
546
543
|
await log.debug("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
547
544
|
await log.debug("\u51C6\u5907\u6267\u884C\u8FD4\u56DE\u903B\u8F91...");
|
|
548
545
|
await \u63A5\u53E3\u7ED3\u679C.run(req, res);
|
|
@@ -569,18 +566,18 @@ var \u670D\u52A1\u5668 = class {
|
|
|
569
566
|
res.send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
|
|
570
567
|
}
|
|
571
568
|
});
|
|
572
|
-
|
|
573
|
-
|
|
569
|
+
let server = app.listen(this.\u7AEF\u53E3);
|
|
570
|
+
let wss = new import_ws2.WebSocketServer({ server });
|
|
574
571
|
wss.on("connection", async (ws, req) => {
|
|
575
|
-
|
|
572
|
+
let log = (await this.log).extend("WebSocket").extend((0, import_short_uuid.default)().new());
|
|
576
573
|
await log.debug(`WebSocket \u8BF7\u6C42\u8FDE\u63A5: ${req.url}`);
|
|
577
|
-
|
|
578
|
-
|
|
574
|
+
let WebSocket\u7BA1\u7406\u80052 = await Global.getItem("WebSocket\u7BA1\u7406\u8005");
|
|
575
|
+
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1];
|
|
579
576
|
if (!\u5BA2\u6237\u7AEFid)
|
|
580
577
|
return ws.close(4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
581
578
|
if (await WebSocket\u7BA1\u7406\u80052.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid) == true)
|
|
582
579
|
return ws.close(4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
583
|
-
|
|
580
|
+
let \u5B58\u5728\u7684\u5BA2\u6237\u7AEFid = \u5BA2\u6237\u7AEFid;
|
|
584
581
|
await WebSocket\u7BA1\u7406\u80052.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
585
582
|
await log.debug(`WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEFid: ${\u5BA2\u6237\u7AEFid}`);
|
|
586
583
|
ws.on("close", async () => {
|
|
@@ -59,7 +59,7 @@ var Global = new import_ts_global.GlobalService([
|
|
|
59
59
|
|
|
60
60
|
// src/tools/tools.ts
|
|
61
61
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
62
|
-
|
|
62
|
+
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
63
63
|
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
64
64
|
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
65
65
|
return \u5185\u5BB9;
|
|
@@ -70,8 +70,8 @@ function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
|
70
70
|
if (Array.isArray(\u6570\u636E))
|
|
71
71
|
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
72
72
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
73
|
-
|
|
74
|
-
for (
|
|
73
|
+
let \u65B0\u6570\u636E = {};
|
|
74
|
+
for (let key in \u6570\u636E) {
|
|
75
75
|
if (\u6570\u636E.hasOwnProperty(key))
|
|
76
76
|
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
77
77
|
}
|
|
@@ -93,7 +93,7 @@ var \u6B63\u786EJSON\u7ED3\u679C = class extends \u6B63\u786E\u7ED3\u679C {
|
|
|
93
93
|
}
|
|
94
94
|
log = Global.getItem("log");
|
|
95
95
|
async run(req, res) {
|
|
96
|
-
|
|
96
|
+
let log = (await this.log).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
97
97
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
98
98
|
res.send(this.data);
|
|
99
99
|
}
|
|
@@ -108,7 +108,7 @@ var \u9519\u8BEFJSON\u7ED3\u679C = class extends \u9519\u8BEF\u7ED3\u679C {
|
|
|
108
108
|
}
|
|
109
109
|
log = Global.getItem("log");
|
|
110
110
|
async run(req, res) {
|
|
111
|
-
|
|
111
|
+
let log = (await this.log).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
112
112
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
113
113
|
res.send(this.data);
|
|
114
114
|
}
|
|
@@ -129,7 +129,7 @@ var JSON\u63A5\u53E3 = class extends \u63A5\u53E3 {
|
|
|
129
129
|
return this.\u63A5\u53E3\u7C7B\u578B\u63CF\u8FF0;
|
|
130
130
|
}
|
|
131
131
|
async \u63A5\u53E3\u5B9E\u73B0(\u53C2\u6570) {
|
|
132
|
-
|
|
132
|
+
let c = await this.\u4E1A\u52A1\u884C\u4E3A.\u8FD0\u884C\u4E1A\u52A1\u884C\u4E3A(\u53C2\u6570);
|
|
133
133
|
if (c.isLeft())
|
|
134
134
|
return new \u9519\u8BEFJSON\u7ED3\u679C(c.assertLeft().getLeft());
|
|
135
135
|
return new \u6B63\u786EJSON\u7ED3\u679C(c.assertRight().getRight());
|
|
@@ -61,7 +61,7 @@ var Global = new import_ts_global.GlobalService([
|
|
|
61
61
|
|
|
62
62
|
// src/tools/tools.ts
|
|
63
63
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
64
|
-
|
|
64
|
+
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
65
65
|
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
66
66
|
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
67
67
|
return \u5185\u5BB9;
|
|
@@ -72,8 +72,8 @@ function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
|
72
72
|
if (Array.isArray(\u6570\u636E))
|
|
73
73
|
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
74
74
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
75
|
-
|
|
76
|
-
for (
|
|
75
|
+
let \u65B0\u6570\u636E = {};
|
|
76
|
+
for (let key in \u6570\u636E) {
|
|
77
77
|
if (\u6570\u636E.hasOwnProperty(key))
|
|
78
78
|
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
79
79
|
}
|
|
@@ -95,7 +95,7 @@ var \u6B63\u786EJSON\u7ED3\u679C = class extends \u6B63\u786E\u7ED3\u679C {
|
|
|
95
95
|
}
|
|
96
96
|
log = Global.getItem("log");
|
|
97
97
|
async run(req, res) {
|
|
98
|
-
|
|
98
|
+
let log = (await this.log).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
99
99
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
100
100
|
res.send(this.data);
|
|
101
101
|
}
|
|
@@ -110,7 +110,7 @@ var \u9519\u8BEFJSON\u7ED3\u679C = class extends \u9519\u8BEF\u7ED3\u679C {
|
|
|
110
110
|
}
|
|
111
111
|
log = Global.getItem("log");
|
|
112
112
|
async run(req, res) {
|
|
113
|
-
|
|
113
|
+
let log = (await this.log).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
114
114
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
115
115
|
res.send(this.data);
|
|
116
116
|
}
|
|
@@ -168,7 +168,7 @@ var JSON\u72B6\u6001\u63A5\u53E3 = class extends \u63A5\u53E3 {
|
|
|
168
168
|
return this.\u63A5\u53E3\u7C7B\u578B\u63CF\u8FF0;
|
|
169
169
|
}
|
|
170
170
|
async \u63A5\u53E3\u5B9E\u73B0(\u53C2\u6570) {
|
|
171
|
-
|
|
171
|
+
let c = await this.\u4E1A\u52A1\u884C\u4E3A.\u8FD0\u884C\u4E1A\u52A1\u884C\u4E3A(\u53C2\u6570);
|
|
172
172
|
if (c.isLeft())
|
|
173
173
|
return new \u9519\u8BEFJSON\u7ED3\u679C({ status: "fail", data: c.assertLeft().getLeft() });
|
|
174
174
|
return new \u6B63\u786EJSON\u7ED3\u679C({ status: "success", data: c.assertRight().getRight() });
|
|
@@ -31,7 +31,7 @@ var \u63A5\u53E3\u6D4B\u8BD5 = class {
|
|
|
31
31
|
}
|
|
32
32
|
async \u8FD0\u884C() {
|
|
33
33
|
await this.\u524D\u7F6E\u5B9E\u73B0();
|
|
34
|
-
|
|
34
|
+
let \u4E2D\u7F6E\u7ED3\u679C = await this.\u4E2D\u7F6E\u5B9E\u73B0();
|
|
35
35
|
await this.\u540E\u7F6E\u5B9E\u73B0(\u4E2D\u7F6E\u7ED3\u679C);
|
|
36
36
|
}
|
|
37
37
|
};
|
|
@@ -45,8 +45,8 @@ var zod\u7C7B\u578B\u8868\u793A = import_zod.z.object({});
|
|
|
45
45
|
var \u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
46
46
|
constructor() {
|
|
47
47
|
super(zod\u7C7B\u578B\u8868\u793A, async (request) => {
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
let url = new import_node_url.URL(request.url);
|
|
49
|
+
let pathname = url.pathname;
|
|
50
50
|
request.url = request.originalUrl = pathname.replace(pathname, decodeURIComponent(pathname));
|
|
51
51
|
return {};
|
|
52
52
|
});
|
|
@@ -3,7 +3,7 @@ import { 插件 as __ } from '../plug.cjs';
|
|
|
3
3
|
import 'express';
|
|
4
4
|
import '@lsby/ts-fp-data';
|
|
5
5
|
|
|
6
|
-
declare
|
|
6
|
+
declare let zod类型表示: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>;
|
|
7
7
|
declare class 中文路径支持插件 extends __<typeof zod类型表示> {
|
|
8
8
|
constructor();
|
|
9
9
|
}
|
|
@@ -71,7 +71,7 @@ var Global = new import_ts_global.GlobalService([
|
|
|
71
71
|
|
|
72
72
|
// src/tools/tools.ts
|
|
73
73
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
74
|
-
|
|
74
|
+
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
75
75
|
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
76
76
|
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
77
77
|
return \u5185\u5BB9;
|
|
@@ -82,8 +82,8 @@ function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
|
82
82
|
if (Array.isArray(\u6570\u636E))
|
|
83
83
|
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
84
84
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
85
|
-
|
|
86
|
-
for (
|
|
85
|
+
let \u65B0\u6570\u636E = {};
|
|
86
|
+
for (let key in \u6570\u636E) {
|
|
87
87
|
if (\u6570\u636E.hasOwnProperty(key))
|
|
88
88
|
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
89
89
|
}
|
|
@@ -111,14 +111,14 @@ var JSON\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
111
111
|
log = Global.getItem("log");
|
|
112
112
|
constructor(t, opt) {
|
|
113
113
|
super(t, async (req, res) => {
|
|
114
|
-
|
|
114
|
+
let log = (await this.log).extend("JSON\u89E3\u6790\u63D2\u4EF6");
|
|
115
115
|
await new Promise(
|
|
116
116
|
(pRes, _rej) => import_express.default.json(opt)(req, res, () => {
|
|
117
117
|
pRes(null);
|
|
118
118
|
})
|
|
119
119
|
);
|
|
120
120
|
await log.debug("\u51C6\u5907\u89E3\u6790 JSON\uFF1A%o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.body));
|
|
121
|
-
|
|
121
|
+
let parseResult = t.safeParse(req.body);
|
|
122
122
|
if (!parseResult.success) {
|
|
123
123
|
await log.err("\u89E3\u6790 JSON \u5931\u8D25\uFF1A%o", parseResult.error);
|
|
124
124
|
throw new Error((0, import_node_util.format)("\u89E3\u6790 JSON \u5931\u8D25: %O", parseResult.error));
|
|
@@ -59,7 +59,7 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
59
59
|
pRes(null);
|
|
60
60
|
})
|
|
61
61
|
);
|
|
62
|
-
|
|
62
|
+
let parseResult = t.safeParse(req.body);
|
|
63
63
|
if (!parseResult.success)
|
|
64
64
|
throw new Error((0, import_node_util.format)("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %O", parseResult.error));
|
|
65
65
|
return parseResult.data;
|
|
@@ -83,30 +83,27 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
83
83
|
}).or(import_zod.z.undefined())
|
|
84
84
|
}),
|
|
85
85
|
async (req, _res) => {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
var ws\u53E5\u67C4 = null;
|
|
86
|
+
let wsId = req.headers["ws-client-id"];
|
|
87
|
+
let WebSocket\u7BA1\u7406\u80052 = await Global.getItem("WebSocket\u7BA1\u7406\u8005");
|
|
88
|
+
let ws\u53E5\u67C4 = null;
|
|
90
89
|
if (typeof wsId == "string")
|
|
91
90
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u80052.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
92
91
|
if (!ws\u53E5\u67C4)
|
|
93
92
|
return { ws\u64CD\u4F5C: void 0 };
|
|
94
|
-
|
|
93
|
+
let \u5B58\u5728\u7684ws\u53E5\u67C4 = ws\u53E5\u67C4;
|
|
95
94
|
return {
|
|
96
95
|
ws\u64CD\u4F5C: {
|
|
97
96
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
98
|
-
|
|
99
|
-
\u5B58\u5728\u7684ws\u53E5\u67C4.send(JSON.stringify(\u4FE1\u606F))
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
97
|
+
return new Promise((res, rej) => {
|
|
98
|
+
\u5B58\u5728\u7684ws\u53E5\u67C4.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
99
|
+
if (err)
|
|
100
|
+
return rej(err);
|
|
101
|
+
return res();
|
|
102
|
+
});
|
|
103
|
+
});
|
|
103
104
|
},
|
|
104
105
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
105
|
-
|
|
106
|
-
\u5B58\u5728\u7684ws\u53E5\u67C4.close();
|
|
107
|
-
} catch (e) {
|
|
108
|
-
await log.err(e);
|
|
109
|
-
}
|
|
106
|
+
\u5B58\u5728\u7684ws\u53E5\u67C4.close();
|
|
110
107
|
}
|
|
111
108
|
}
|
|
112
109
|
};
|
|
@@ -64,7 +64,7 @@ var Global = new import_ts_global.GlobalService([
|
|
|
64
64
|
|
|
65
65
|
// src/tools/tools.ts
|
|
66
66
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
67
|
-
|
|
67
|
+
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
68
68
|
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
69
69
|
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
70
70
|
return \u5185\u5BB9;
|
|
@@ -75,8 +75,8 @@ function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
|
75
75
|
if (Array.isArray(\u6570\u636E))
|
|
76
76
|
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
77
77
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
78
|
-
|
|
79
|
-
for (
|
|
78
|
+
let \u65B0\u6570\u636E = {};
|
|
79
|
+
for (let key in \u6570\u636E) {
|
|
80
80
|
if (\u6570\u636E.hasOwnProperty(key))
|
|
81
81
|
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
82
82
|
}
|
|
@@ -98,7 +98,7 @@ var \u6B63\u786EJSON\u7ED3\u679C = class extends \u6B63\u786E\u7ED3\u679C {
|
|
|
98
98
|
}
|
|
99
99
|
log = Global.getItem("log");
|
|
100
100
|
async run(req, res) {
|
|
101
|
-
|
|
101
|
+
let log = (await this.log).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
102
102
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
103
103
|
res.send(this.data);
|
|
104
104
|
}
|
|
@@ -122,7 +122,7 @@ var \u9519\u8BEFJSON\u7ED3\u679C = class extends \u9519\u8BEF\u7ED3\u679C {
|
|
|
122
122
|
}
|
|
123
123
|
log = Global.getItem("log");
|
|
124
124
|
async run(req, res) {
|
|
125
|
-
|
|
125
|
+
let log = (await this.log).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
126
126
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
127
127
|
res.send(this.data);
|
|
128
128
|
}
|
|
@@ -80,27 +80,27 @@ var \u670D\u52A1\u5668 = class {
|
|
|
80
80
|
}
|
|
81
81
|
log = Global.getItem("log");
|
|
82
82
|
async run() {
|
|
83
|
-
|
|
83
|
+
let app = (0, import_express.default)();
|
|
84
84
|
app.use(async (req, res) => {
|
|
85
|
-
|
|
85
|
+
let log = (await this.log).extend("\u8BF7\u6C42").extend((0, import_short_uuid.default)().new());
|
|
86
86
|
try {
|
|
87
|
-
|
|
88
|
-
|
|
87
|
+
let \u8BF7\u6C42\u8DEF\u5F84 = req.path;
|
|
88
|
+
let \u8BF7\u6C42\u65B9\u6CD5 = req.method.toLowerCase();
|
|
89
89
|
await log.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
90
90
|
await log.debug("\u5C1D\u8BD5\u5339\u914D\u63A5\u53E3...");
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
return \u8BF7\u6C42\u8DEF\u5F84 == \u63A5\u53E3\u7C7B\
|
|
91
|
+
let \u76EE\u6807\u63A5\u53E3 = this.\u63A5\u53E3\u4EEC.find((\u63A5\u53E3) => {
|
|
92
|
+
let \u63A5\u53E3\u7C7B\u578B = \u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u7C7B\u578B();
|
|
93
|
+
return \u8BF7\u6C42\u8DEF\u5F84 == \u63A5\u53E3\u7C7B\u578B.\u83B7\u5F97\u8DEF\u5F84() && \u8BF7\u6C42\u65B9\u6CD5 == \u63A5\u53E3\u7C7B\u578B.\u83B7\u5F97\u65B9\u6CD5();
|
|
94
94
|
});
|
|
95
95
|
if (\u76EE\u6807\u63A5\u53E3 != null) {
|
|
96
96
|
await log.debug("\u547D\u4E2D\u63A5\u53E3");
|
|
97
|
-
|
|
98
|
-
|
|
97
|
+
let \u63A5\u53E3\u7C7B\u578B = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u7C7B\u578B();
|
|
98
|
+
let \u63A5\u53E3\u63D2\u4EF6 = \u63A5\u53E3\u7C7B\u578B.\u83B7\u5F97\u63D2\u4EF6\u4EEC();
|
|
99
99
|
await log.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63A5\u53E3\u63D2\u4EF6.length);
|
|
100
|
-
|
|
100
|
+
let \u63D2\u4EF6\u7ED3\u679C = (await Promise.all(\u63A5\u53E3\u63D2\u4EF6.map(async (\u63D2\u4EF6) => await (await \u63D2\u4EF6.run()).\u83B7\u5F97\u5B9E\u73B0()(req, res)))).reduce((s, a) => Object.assign(s, a), {});
|
|
101
101
|
await log.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
|
|
102
102
|
await log.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u903B\u8F91...");
|
|
103
|
-
|
|
103
|
+
let \u63A5\u53E3\u7ED3\u679C = await \u76EE\u6807\u63A5\u53E3.\u63A5\u53E3\u5B9E\u73B0(\u63D2\u4EF6\u7ED3\u679C);
|
|
104
104
|
await log.debug("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
105
105
|
await log.debug("\u51C6\u5907\u6267\u884C\u8FD4\u56DE\u903B\u8F91...");
|
|
106
106
|
await \u63A5\u53E3\u7ED3\u679C.run(req, res);
|
|
@@ -127,18 +127,18 @@ var \u670D\u52A1\u5668 = class {
|
|
|
127
127
|
res.send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
|
|
128
128
|
}
|
|
129
129
|
});
|
|
130
|
-
|
|
131
|
-
|
|
130
|
+
let server = app.listen(this.\u7AEF\u53E3);
|
|
131
|
+
let wss = new import_ws2.WebSocketServer({ server });
|
|
132
132
|
wss.on("connection", async (ws, req) => {
|
|
133
|
-
|
|
133
|
+
let log = (await this.log).extend("WebSocket").extend((0, import_short_uuid.default)().new());
|
|
134
134
|
await log.debug(`WebSocket \u8BF7\u6C42\u8FDE\u63A5: ${req.url}`);
|
|
135
|
-
|
|
136
|
-
|
|
135
|
+
let WebSocket\u7BA1\u7406\u80052 = await Global.getItem("WebSocket\u7BA1\u7406\u8005");
|
|
136
|
+
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1];
|
|
137
137
|
if (!\u5BA2\u6237\u7AEFid)
|
|
138
138
|
return ws.close(4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
139
139
|
if (await WebSocket\u7BA1\u7406\u80052.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid) == true)
|
|
140
140
|
return ws.close(4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
141
|
-
|
|
141
|
+
let \u5B58\u5728\u7684\u5BA2\u6237\u7AEFid = \u5BA2\u6237\u7AEFid;
|
|
142
142
|
await WebSocket\u7BA1\u7406\u80052.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
143
143
|
await log.debug(`WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEFid: ${\u5BA2\u6237\u7AEFid}`);
|
|
144
144
|
ws.on("close", async () => {
|
package/dist/cjs/tools/tools.cjs
CHANGED
|
@@ -25,7 +25,7 @@ __export(tools_exports, {
|
|
|
25
25
|
});
|
|
26
26
|
module.exports = __toCommonJS(tools_exports);
|
|
27
27
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
28
|
-
|
|
28
|
+
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
29
29
|
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
30
30
|
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
31
31
|
return \u5185\u5BB9;
|
|
@@ -36,8 +36,8 @@ function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
|
36
36
|
if (Array.isArray(\u6570\u636E))
|
|
37
37
|
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
38
38
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
39
|
-
|
|
40
|
-
for (
|
|
39
|
+
let \u65B0\u6570\u636E = {};
|
|
40
|
+
for (let key in \u6570\u636E) {
|
|
41
41
|
if (\u6570\u636E.hasOwnProperty(key))
|
|
42
42
|
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
43
43
|
}
|