@lsby/net-core 0.7.26 → 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 +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/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 +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 +4 -4
- package/dist/cjs/index.cjs +86 -104
- 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 +5 -5
- 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 +5 -5
- package/dist/cjs/plugin/extend/web-socket.cjs +12 -12
- package/dist/cjs/server/server.cjs +30 -29
- 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-VNRSKOGV.js → chunk-2ZZ7CFND.js} +2 -2
- package/dist/esm/{chunk-2TMAYLLR.js → chunk-4POMXQ7K.js} +13 -13
- 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-CGLDW3PN.js → chunk-J3NG7DBJ.js} +9 -9
- package/dist/esm/{chunk-RSNOS5LV.js → chunk-JLDRKJBS.js} +29 -28
- 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-VTVWF3IE.js → chunk-Q3UCXVAN.js} +4 -4
- package/dist/esm/{chunk-SWPAN4RD.js → chunk-REFLUHAF.js} +2 -2
- 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/global/global.js +1 -1
- package/dist/esm/index.d.ts +0 -1
- package/dist/esm/index.js +15 -19
- package/dist/esm/interface/interface-logic.js +1 -1
- package/dist/esm/plugin/extend/custom-data.js +2 -2
- 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 +2 -2
- package/dist/esm/plugin/extend/web-socket.js +2 -2
- package/dist/esm/server/server.js +2 -2
- package/package.json +4 -4
- 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
package/dist/cjs/index.cjs
CHANGED
|
@@ -34,7 +34,6 @@ __export(index_exports, {
|
|
|
34
34
|
GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6: () => GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
|
|
35
35
|
JSON\u89E3\u6790\u63D2\u4EF6: () => JSON\u89E3\u6790\u63D2\u4EF6,
|
|
36
36
|
WebSocket\u63D2\u4EF6: () => WebSocket\u63D2\u4EF6,
|
|
37
|
-
\u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6: () => \u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6,
|
|
38
37
|
\u53D1\u9001\u6587\u4EF6\u63D2\u4EF6: () => \u53D1\u9001\u6587\u4EF6\u63D2\u4EF6,
|
|
39
38
|
\u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5: () => \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5,
|
|
40
39
|
\u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668: () => \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668,
|
|
@@ -131,7 +130,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
131
130
|
async \u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
|
|
132
131
|
let \u65E5\u5FD7\u5BF9\u8C61 = \u8BF7\u6C42\u9644\u52A0\u53C2\u6570.log;
|
|
133
132
|
let \u63D2\u4EF6\u4EEC = this.\u83B7\u5F97\u63D2\u4EF6\u4EEC();
|
|
134
|
-
|
|
133
|
+
\u65E5\u5FD7\u5BF9\u8C61.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63D2\u4EF6\u4EEC.length);
|
|
135
134
|
let \u6240\u6709\u63D2\u4EF6\u7ED3\u679C = [];
|
|
136
135
|
for (let \u63D2\u4EF62 of \u63D2\u4EF6\u4EEC) {
|
|
137
136
|
let \u63D2\u4EF6\u672C\u4F53 = await \u63D2\u4EF62.run();
|
|
@@ -139,16 +138,16 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
139
138
|
\u6240\u6709\u63D2\u4EF6\u7ED3\u679C.push(\u63D2\u4EF6\u8FD4\u56DE);
|
|
140
139
|
}
|
|
141
140
|
let \u5408\u5E76\u7ED3\u679C = \u6240\u6709\u63D2\u4EF6\u7ED3\u679C.reduce((s, a) => ({ ...s, ...a }), {});
|
|
142
|
-
|
|
141
|
+
\u65E5\u5FD7\u5BF9\u8C61.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
|
|
143
142
|
return \u5408\u5E76\u7ED3\u679C;
|
|
144
143
|
}
|
|
145
144
|
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) {
|
|
146
145
|
let log2 = \u4F20\u5165\u7684\u63D2\u4EF6\u9644\u52A0\u53C2\u6570.log.extend("\u63A5\u53E3\u903B\u8F91");
|
|
147
146
|
let \u6E05\u7406\u51FD\u6570 = this.\u83B7\u5F97\u6E05\u7406\u51FD\u6570?.();
|
|
148
147
|
try {
|
|
149
|
-
|
|
148
|
+
log2.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
|
|
150
149
|
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);
|
|
151
|
-
|
|
150
|
+
log2.debug("\u63A5\u53E3\u5B9E\u73B0\u6267\u884C\u5B8C\u6BD5");
|
|
152
151
|
let \u6700\u7EC8\u7ED3\u679C = \u5B9E\u73B0\u7ED3\u679C.map((a) => ({ ...\u4F20\u5165\u7684\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...a }));
|
|
153
152
|
if (\u6E05\u7406\u51FD\u6570 !== void 0) {
|
|
154
153
|
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;
|
|
@@ -278,37 +277,6 @@ var \u63A5\u53E3\u6D4B\u8BD5 = class {
|
|
|
278
277
|
}
|
|
279
278
|
};
|
|
280
279
|
|
|
281
|
-
// src/plugin/extend/chinese-path.ts
|
|
282
|
-
var import_node_url = require("url");
|
|
283
|
-
var import_zod = require("zod");
|
|
284
|
-
|
|
285
|
-
// src/plugin/plug.ts
|
|
286
|
-
var \u63D2\u4EF6 = class {
|
|
287
|
-
constructor(\u7C7B\u578B, \u5B9E\u73B0) {
|
|
288
|
-
this.\u7C7B\u578B = \u7C7B\u578B;
|
|
289
|
-
this.\u5B9E\u73B0 = \u5B9E\u73B0;
|
|
290
|
-
}
|
|
291
|
-
\u83B7\u5F97\u7C7B\u578B() {
|
|
292
|
-
return this.\u7C7B\u578B;
|
|
293
|
-
}
|
|
294
|
-
\u8FD0\u884C(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
295
|
-
return this.\u5B9E\u73B0(req, res, \u9644\u52A0\u53C2\u6570);
|
|
296
|
-
}
|
|
297
|
-
};
|
|
298
|
-
|
|
299
|
-
// src/plugin/extend/chinese-path.ts
|
|
300
|
-
var zod\u7C7B\u578B\u8868\u793A = import_zod.z.object({});
|
|
301
|
-
var \u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
302
|
-
constructor() {
|
|
303
|
-
super(zod\u7C7B\u578B\u8868\u793A, async (request) => {
|
|
304
|
-
let url = new import_node_url.URL(request.url);
|
|
305
|
-
let pathname = url.pathname;
|
|
306
|
-
request.url = request.originalUrl = pathname.replace(pathname, decodeURIComponent(pathname));
|
|
307
|
-
return {};
|
|
308
|
-
});
|
|
309
|
-
}
|
|
310
|
-
};
|
|
311
|
-
|
|
312
280
|
// src/global/global.ts
|
|
313
281
|
var import_ts_global = require("@lsby/ts-global");
|
|
314
282
|
var import_ts_log = require("@lsby/ts-log");
|
|
@@ -319,7 +287,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
319
287
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
320
288
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
321
289
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
322
|
-
this.log.
|
|
290
|
+
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
323
291
|
});
|
|
324
292
|
}, 3e4);
|
|
325
293
|
}
|
|
@@ -344,9 +312,9 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
344
312
|
try {
|
|
345
313
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
346
314
|
} catch (err) {
|
|
347
|
-
this.log.
|
|
315
|
+
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
348
316
|
}
|
|
349
|
-
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.
|
|
317
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
350
318
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
351
319
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
352
320
|
}
|
|
@@ -359,7 +327,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
359
327
|
}
|
|
360
328
|
}
|
|
361
329
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
362
|
-
this.log.
|
|
330
|
+
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
363
331
|
}
|
|
364
332
|
}
|
|
365
333
|
};
|
|
@@ -368,13 +336,27 @@ var Global = new import_ts_global.GlobalService([
|
|
|
368
336
|
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
369
337
|
]);
|
|
370
338
|
|
|
339
|
+
// src/plugin/plug.ts
|
|
340
|
+
var \u63D2\u4EF6 = class {
|
|
341
|
+
constructor(\u7C7B\u578B, \u5B9E\u73B0) {
|
|
342
|
+
this.\u7C7B\u578B = \u7C7B\u578B;
|
|
343
|
+
this.\u5B9E\u73B0 = \u5B9E\u73B0;
|
|
344
|
+
}
|
|
345
|
+
\u83B7\u5F97\u7C7B\u578B() {
|
|
346
|
+
return this.\u7C7B\u578B;
|
|
347
|
+
}
|
|
348
|
+
\u8FD0\u884C(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
349
|
+
return this.\u5B9E\u73B0(req, res, \u9644\u52A0\u53C2\u6570);
|
|
350
|
+
}
|
|
351
|
+
};
|
|
352
|
+
|
|
371
353
|
// src/plugin/extend/custom-data.ts
|
|
372
354
|
var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
373
355
|
log = Global.getItem("log");
|
|
374
356
|
constructor(t, data) {
|
|
375
357
|
super(t, async (_res, _req, \u9644\u52A0\u53C2\u6570) => {
|
|
376
358
|
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6");
|
|
377
|
-
|
|
359
|
+
log2.debug("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6\u8FD0\u884C, \u7ED3\u679C: %o", data);
|
|
378
360
|
return data;
|
|
379
361
|
});
|
|
380
362
|
}
|
|
@@ -415,26 +397,26 @@ var JSON\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
415
397
|
pRes(null);
|
|
416
398
|
})
|
|
417
399
|
);
|
|
418
|
-
|
|
400
|
+
log2.debug("\u51C6\u5907\u89E3\u6790 JSON\uFF1A%o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.body)));
|
|
419
401
|
let parseResult = t.safeParse(req.body);
|
|
420
402
|
if (parseResult.success === false) {
|
|
421
|
-
|
|
403
|
+
log2.error("\u89E3\u6790 JSON \u5931\u8D25\uFF1A%o", parseResult.error);
|
|
422
404
|
throw new Error((0, import_node_util.format)("\u89E3\u6790 JSON \u5931\u8D25: %o", parseResult.error));
|
|
423
405
|
}
|
|
424
|
-
|
|
406
|
+
log2.debug("\u6210\u529F\u89E3\u6790 JSON");
|
|
425
407
|
return parseResult.data;
|
|
426
408
|
});
|
|
427
409
|
}
|
|
428
410
|
};
|
|
429
411
|
|
|
430
412
|
// src/plugin/extend/log-headers.ts
|
|
431
|
-
var
|
|
432
|
-
var zod\u7C7B\u578B\u8868\
|
|
413
|
+
var import_zod = require("zod");
|
|
414
|
+
var zod\u7C7B\u578B\u8868\u793A = import_zod.z.object({});
|
|
433
415
|
var \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
434
416
|
constructor() {
|
|
435
|
-
super(zod\u7C7B\u578B\u8868\
|
|
417
|
+
super(zod\u7C7B\u578B\u8868\u793A, async (req, res, \u9644\u52A0\u53C2\u6570) => {
|
|
436
418
|
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("\u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6");
|
|
437
|
-
|
|
419
|
+
log2.debug(req.headers);
|
|
438
420
|
return {};
|
|
439
421
|
});
|
|
440
422
|
}
|
|
@@ -448,24 +430,24 @@ var GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
448
430
|
constructor(t) {
|
|
449
431
|
super(t, async (req, _res, \u9644\u52A0\u53C2\u6570) => {
|
|
450
432
|
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6");
|
|
451
|
-
|
|
433
|
+
log2.debug("\u51C6\u5907\u89E3\u6790 GET \u53C2\u6570\uFF1A%o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(req.query)));
|
|
452
434
|
let parseResult = t.safeParse(req.query);
|
|
453
435
|
if (parseResult.success === false) {
|
|
454
|
-
|
|
436
|
+
log2.error("\u89E3\u6790 GET \u53C2\u6570\u5931\u8D25\uFF1A%o", parseResult.error);
|
|
455
437
|
throw new Error((0, import_node_util2.format)("\u89E3\u6790 GET \u53C2\u6570\u5931\u8D25: %o", parseResult.error));
|
|
456
438
|
}
|
|
457
|
-
|
|
439
|
+
log2.debug("\u6210\u529F\u89E3\u6790 GET \u53C2\u6570");
|
|
458
440
|
return parseResult.data;
|
|
459
441
|
});
|
|
460
442
|
}
|
|
461
443
|
};
|
|
462
444
|
|
|
463
445
|
// src/plugin/extend/send-file-plugin.ts
|
|
464
|
-
var
|
|
465
|
-
var zod\u7C7B\u578B\u8868\
|
|
446
|
+
var import_zod2 = require("zod");
|
|
447
|
+
var zod\u7C7B\u578B\u8868\u793A2 = import_zod2.z.object({ sendFile: import_zod2.z.function(import_zod2.z.tuple([import_zod2.z.instanceof(Buffer)]), import_zod2.z.instanceof(Buffer)) });
|
|
466
448
|
var \u53D1\u9001\u6587\u4EF6\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
467
449
|
constructor() {
|
|
468
|
-
super(zod\u7C7B\u578B\u8868\
|
|
450
|
+
super(zod\u7C7B\u578B\u8868\u793A2, async (_req, _res) => {
|
|
469
451
|
return {
|
|
470
452
|
sendFile: (file) => {
|
|
471
453
|
return file;
|
|
@@ -490,7 +472,7 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
490
472
|
);
|
|
491
473
|
let parseResult = t.safeParse(req.body);
|
|
492
474
|
if (parseResult.success === false) {
|
|
493
|
-
|
|
475
|
+
log2.error("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error);
|
|
494
476
|
throw new Error((0, import_node_util3.format)("\u89E3\u6790url\u7F16\u7801\u6B63\u6587\u5931\u8D25: %o", parseResult.error));
|
|
495
477
|
}
|
|
496
478
|
return parseResult.data;
|
|
@@ -500,29 +482,29 @@ var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
500
482
|
|
|
501
483
|
// src/plugin/extend/web-socket.ts
|
|
502
484
|
var import_ws2 = require("ws");
|
|
503
|
-
var
|
|
485
|
+
var import_zod3 = require("zod");
|
|
504
486
|
var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
505
487
|
log = Global.getItem("log");
|
|
506
488
|
constructor(\u4FE1\u606F\u63CF\u8FF0) {
|
|
507
489
|
super(
|
|
508
|
-
|
|
509
|
-
ws\u64CD\u4F5C:
|
|
510
|
-
\u53D1\u9001ws\u4FE1\u606F:
|
|
511
|
-
\u5173\u95EDws\u8FDE\u63A5:
|
|
512
|
-
\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570:
|
|
513
|
-
}).or(
|
|
490
|
+
import_zod3.z.object({
|
|
491
|
+
ws\u64CD\u4F5C: import_zod3.z.object({
|
|
492
|
+
\u53D1\u9001ws\u4FE1\u606F: import_zod3.z.function(import_zod3.z.tuple([\u4FE1\u606F\u63CF\u8FF0]), import_zod3.z.promise(import_zod3.z.void())),
|
|
493
|
+
\u5173\u95EDws\u8FDE\u63A5: import_zod3.z.function(import_zod3.z.tuple([]), import_zod3.z.promise(import_zod3.z.void())),
|
|
494
|
+
\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570: import_zod3.z.function(import_zod3.z.tuple([import_zod3.z.function(import_zod3.z.tuple([]), import_zod3.z.promise(import_zod3.z.void()))]), import_zod3.z.promise(import_zod3.z.void()))
|
|
495
|
+
}).or(import_zod3.z.null())
|
|
514
496
|
}),
|
|
515
497
|
async (req, _res, \u9644\u52A0\u53C2\u6570) => {
|
|
516
498
|
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("webSocket\u63D2\u4EF6");
|
|
517
499
|
let WebSocket\u7BA1\u7406\u56682 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
|
|
518
500
|
let ws\u53E5\u67C4 = null;
|
|
519
501
|
let wsId = req.headers["ws-client-id"];
|
|
520
|
-
|
|
502
|
+
log2.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
521
503
|
if (typeof wsId !== "string") {
|
|
522
|
-
|
|
504
|
+
log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket Id");
|
|
523
505
|
return { ws\u64CD\u4F5C: null };
|
|
524
506
|
}
|
|
525
|
-
|
|
507
|
+
log2.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
|
|
526
508
|
return {
|
|
527
509
|
ws\u64CD\u4F5C: {
|
|
528
510
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
@@ -530,17 +512,17 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
530
512
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
531
513
|
}
|
|
532
514
|
if (ws\u53E5\u67C4 === null) {
|
|
533
|
-
|
|
515
|
+
log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
|
|
534
516
|
return;
|
|
535
517
|
}
|
|
536
518
|
if (ws\u53E5\u67C4.readyState !== import_ws2.WebSocket.OPEN) {
|
|
537
|
-
|
|
519
|
+
log2.warn("WebSocket \u672A\u6253\u5F00\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F", { wsId });
|
|
538
520
|
return;
|
|
539
521
|
}
|
|
540
522
|
await new Promise((resolve, reject) => {
|
|
541
523
|
ws\u53E5\u67C4?.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
542
524
|
if (err !== void 0 && err !== null) {
|
|
543
|
-
log2.
|
|
525
|
+
log2.warn("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err });
|
|
544
526
|
return reject(err);
|
|
545
527
|
}
|
|
546
528
|
resolve();
|
|
@@ -548,11 +530,11 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
548
530
|
});
|
|
549
531
|
},
|
|
550
532
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
551
|
-
|
|
533
|
+
log2.debug("\u5173\u95ED WebSocket \u8FDE\u63A5", { wsId });
|
|
552
534
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(wsId);
|
|
553
535
|
},
|
|
554
536
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u6E05\u7406\u51FD\u6570) {
|
|
555
|
-
|
|
537
|
+
log2.debug("\u8BBE\u7F6E WebSocket \u6E05\u7406\u51FD\u6570", { wsId });
|
|
556
538
|
await WebSocket\u7BA1\u7406\u56682.\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(wsId, \u6E05\u7406\u51FD\u6570);
|
|
557
539
|
}
|
|
558
540
|
}
|
|
@@ -580,7 +562,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
580
562
|
let log2 = (await this.log).extend("\u670D\u52A1\u5668");
|
|
581
563
|
let app = (0, import_express3.default)();
|
|
582
564
|
if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
|
|
583
|
-
|
|
565
|
+
log2.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
|
|
584
566
|
app.use(import_express3.default.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
|
|
585
567
|
}
|
|
586
568
|
app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
|
|
@@ -595,8 +577,9 @@ var \u670D\u52A1\u5668 = class {
|
|
|
595
577
|
let \u5F00\u59CB\u65F6\u95F4 = Date.now();
|
|
596
578
|
try {
|
|
597
579
|
let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
|
|
580
|
+
\u8BF7\u6C42\u8DEF\u5F84 = decodeURIComponent(\u8BF7\u6C42\u8DEF\u5F84);
|
|
598
581
|
let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
|
|
599
|
-
|
|
582
|
+
log2.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
600
583
|
let \u76EE\u6807\u63A5\u53E3 = this.\u63A5\u53E3\u4EEC.find((\u63A5\u53E32) => \u8BF7\u6C42\u65B9\u6CD5 === \u63A5\u53E32.\u83B7\u5F97\u65B9\u6CD5() && \u8BF7\u6C42\u8DEF\u5F84 === \u63A5\u53E32.\u83B7\u5F97\u8DEF\u5F84()) ?? null;
|
|
601
584
|
if (\u76EE\u6807\u63A5\u53E3 !== null) {
|
|
602
585
|
await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, { log: \u4E3Blog });
|
|
@@ -608,17 +591,17 @@ var \u670D\u52A1\u5668 = class {
|
|
|
608
591
|
res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
|
|
609
592
|
return;
|
|
610
593
|
} catch (e) {
|
|
611
|
-
|
|
594
|
+
log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
|
|
612
595
|
}
|
|
613
596
|
}
|
|
614
|
-
|
|
597
|
+
log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
|
|
615
598
|
res.status(404).end();
|
|
616
599
|
} catch (error) {
|
|
617
|
-
|
|
600
|
+
log2.error(error);
|
|
618
601
|
res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
|
|
619
602
|
} finally {
|
|
620
603
|
let \u8017\u65F6ms = Date.now() - \u5F00\u59CB\u65F6\u95F4;
|
|
621
|
-
|
|
604
|
+
\u4E3Blog.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
|
|
622
605
|
}
|
|
623
606
|
}
|
|
624
607
|
async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
|
|
@@ -628,11 +611,11 @@ var \u670D\u52A1\u5668 = class {
|
|
|
628
611
|
let \u7ED3\u679C\u8FD4\u56DE\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8FD4\u56DE\u5668();
|
|
629
612
|
let \u603B\u5F00\u59CB = Date.now();
|
|
630
613
|
let \u5F00\u59CB = Date.now();
|
|
631
|
-
|
|
614
|
+
log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
|
|
632
615
|
let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
633
616
|
let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u63D2\u4EF6\u7ED3\u679C, {}, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
634
617
|
let \u63A5\u53E3\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
635
|
-
|
|
618
|
+
log2.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
|
|
636
619
|
\u5F00\u59CB = Date.now();
|
|
637
620
|
let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
|
|
638
621
|
let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
|
|
@@ -644,61 +627,61 @@ var \u670D\u52A1\u5668 = class {
|
|
|
644
627
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
645
628
|
} else {
|
|
646
629
|
let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
630
|
+
log2.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
|
|
631
|
+
log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
632
|
+
log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
650
633
|
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
|
|
651
634
|
}
|
|
652
635
|
let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
653
|
-
|
|
654
|
-
|
|
636
|
+
log2.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
|
|
637
|
+
log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
|
|
655
638
|
\u5F00\u59CB = Date.now();
|
|
656
639
|
await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
|
|
657
640
|
let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
658
|
-
|
|
641
|
+
log2.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
|
|
659
642
|
let \u603B\u8017\u65F6 = Date.now() - \u603B\u5F00\u59CB;
|
|
660
|
-
|
|
643
|
+
log2.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
|
|
661
644
|
}
|
|
662
645
|
async \u521D\u59CB\u5316WebSocket(server) {
|
|
663
646
|
let wss = new import_ws3.WebSocketServer({ server });
|
|
664
647
|
let logBase = await this.log;
|
|
665
648
|
wss.on("listening", async () => {
|
|
666
649
|
let log2 = logBase;
|
|
667
|
-
|
|
650
|
+
log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
|
|
668
651
|
});
|
|
669
652
|
wss.on("error", async (err) => {
|
|
670
653
|
let log2 = logBase;
|
|
671
|
-
|
|
654
|
+
log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
|
|
672
655
|
});
|
|
673
656
|
wss.on("connection", async (ws, req) => {
|
|
674
657
|
let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
675
|
-
log2.
|
|
658
|
+
log2.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
676
659
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
677
660
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
678
|
-
log2.
|
|
661
|
+
log2.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
679
662
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
680
663
|
}
|
|
681
|
-
log2.
|
|
664
|
+
log2.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
682
665
|
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
683
666
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
684
667
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
685
|
-
log2.
|
|
668
|
+
log2.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
686
669
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
687
670
|
}
|
|
688
671
|
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
689
|
-
log2.
|
|
672
|
+
log2.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
690
673
|
ws.on("close", async () => {
|
|
691
|
-
log2.
|
|
674
|
+
log2.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
692
675
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
693
676
|
});
|
|
694
677
|
ws.on("error", async (err) => {
|
|
695
|
-
log2.
|
|
678
|
+
log2.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
696
679
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
697
680
|
});
|
|
698
681
|
});
|
|
699
682
|
}
|
|
700
683
|
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, code, reason) {
|
|
701
|
-
|
|
684
|
+
log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
|
|
702
685
|
ws.close(code, reason);
|
|
703
686
|
}
|
|
704
687
|
\u83B7\u53D6\u672C\u5730\u5730\u5740() {
|
|
@@ -710,32 +693,32 @@ var \u670D\u52A1\u5668 = class {
|
|
|
710
693
|
var EXPORT_TYPE = Symbol();
|
|
711
694
|
|
|
712
695
|
// src/wrapper/common-wrapper.ts
|
|
713
|
-
var
|
|
696
|
+
var import_zod4 = require("zod");
|
|
714
697
|
var \u5E38\u7528\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5 = class extends \u63A5\u53E3 {
|
|
715
698
|
constructor(\u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5, \u63A5\u53E3\u903B\u8F912, \u903B\u8F91\u9519\u8BEF\u7C7B\u578BZod, \u903B\u8F91\u6B63\u786E\u7C7B\u578BZod) {
|
|
716
|
-
let \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F =
|
|
717
|
-
let \u63A5\u53E3\u6B63\u786E\u8F93\u51FA\u5F62\u5F0F =
|
|
699
|
+
let \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F = import_zod4.z.object({ status: import_zod4.z.literal("fail"), data: \u903B\u8F91\u9519\u8BEF\u7C7B\u578BZod });
|
|
700
|
+
let \u63A5\u53E3\u6B63\u786E\u8F93\u51FA\u5F62\u5F0F = import_zod4.z.object({ status: import_zod4.z.literal("success"), data: \u903B\u8F91\u6B63\u786E\u7C7B\u578BZod });
|
|
718
701
|
let \u63A5\u53E3\u8F6C\u6362\u5668 = new \u5E38\u7528\u5F62\u5F0F\u8F6C\u6362\u5668();
|
|
719
702
|
super(\u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5, \u63A5\u53E3\u903B\u8F912, \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F, \u63A5\u53E3\u6B63\u786E\u8F93\u51FA\u5F62\u5F0F, \u63A5\u53E3\u8F6C\u6362\u5668, new \u5E38\u7528\u8FD4\u56DE\u5668());
|
|
720
703
|
}
|
|
721
704
|
};
|
|
722
705
|
|
|
723
706
|
// src/wrapper/common-wrapper-return.ts
|
|
724
|
-
var
|
|
707
|
+
var import_zod5 = require("zod");
|
|
725
708
|
var \u5E38\u7528\u5F62\u5F0F\u5E76\u81EA\u5B9A\u4E49\u8FD4\u56DE\u63A5\u53E3\u5C01\u88C5 = class extends \u63A5\u53E3 {
|
|
726
709
|
constructor(\u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5, \u63A5\u53E3\u903B\u8F912, \u903B\u8F91\u9519\u8BEF\u7C7B\u578BZod, \u903B\u8F91\u6B63\u786E\u7C7B\u578BZod, \u8FD4\u56DE\u5668\u5B9E\u73B0) {
|
|
727
|
-
let \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F =
|
|
728
|
-
let \u63A5\u53E3\u6B63\u786E\u8F93\u51FA\u5F62\u5F0F =
|
|
710
|
+
let \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F = import_zod5.z.object({ status: import_zod5.z.literal("fail"), data: \u903B\u8F91\u9519\u8BEF\u7C7B\u578BZod });
|
|
711
|
+
let \u63A5\u53E3\u6B63\u786E\u8F93\u51FA\u5F62\u5F0F = import_zod5.z.object({ status: import_zod5.z.literal("success"), data: \u903B\u8F91\u6B63\u786E\u7C7B\u578BZod });
|
|
729
712
|
let \u63A5\u53E3\u8F6C\u6362\u5668 = new \u5E38\u7528\u5F62\u5F0F\u8F6C\u6362\u5668();
|
|
730
713
|
super(\u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5, \u63A5\u53E3\u903B\u8F912, \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F, \u63A5\u53E3\u6B63\u786E\u8F93\u51FA\u5F62\u5F0F, \u63A5\u53E3\u8F6C\u6362\u5668, new \u81EA\u5B9A\u4E49\u8FD4\u56DE\u5668(\u8FD4\u56DE\u5668\u5B9E\u73B0));
|
|
731
714
|
}
|
|
732
715
|
};
|
|
733
716
|
|
|
734
717
|
// src/wrapper/deferred-result-wrapper.ts
|
|
735
|
-
var
|
|
718
|
+
var import_zod6 = require("zod");
|
|
736
719
|
var \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5 = class extends \u63A5\u53E3 {
|
|
737
720
|
constructor(\u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5, \u63A5\u53E3\u903B\u8F912, \u903B\u8F91\u9519\u8BEF\u7C7B\u578BZod, \u903B\u8F91\u6B63\u786E\u7C7B\u578BZod) {
|
|
738
|
-
let \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F =
|
|
721
|
+
let \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F = import_zod6.z.object({ status: import_zod6.z.literal("fail"), data: \u903B\u8F91\u9519\u8BEF\u7C7B\u578BZod });
|
|
739
722
|
let \u63A5\u53E3\u6B63\u786E\u8F93\u51FA\u5F62\u5F0F = \u903B\u8F91\u6B63\u786E\u7C7B\u578BZod;
|
|
740
723
|
let \u63A5\u53E3\u8F6C\u6362\u5668 = new \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668();
|
|
741
724
|
super(\u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5, \u63A5\u53E3\u903B\u8F912, \u63A5\u53E3\u9519\u8BEF\u8F93\u51FA\u5F62\u5F0F, \u63A5\u53E3\u6B63\u786E\u8F93\u51FA\u5F62\u5F0F, \u63A5\u53E3\u8F6C\u6362\u5668, new \u5E38\u7528\u8FD4\u56DE\u5668());
|
|
@@ -747,7 +730,6 @@ var \u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5 = c
|
|
|
747
730
|
GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
|
|
748
731
|
JSON\u89E3\u6790\u63D2\u4EF6,
|
|
749
732
|
WebSocket\u63D2\u4EF6,
|
|
750
|
-
\u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6,
|
|
751
733
|
\u53D1\u9001\u6587\u4EF6\u63D2\u4EF6,
|
|
752
734
|
\u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5,
|
|
753
735
|
\u5E38\u7528\u5EF6\u65F6\u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668,
|
package/dist/cjs/index.d.cts
CHANGED
|
@@ -2,7 +2,6 @@ export { 构造元组, 构造对象 } from './help/help.cjs';
|
|
|
2
2
|
export { 任 as 任意接口, x as 任意接口结果转换器, n as 任意接口逻辑, z as 任意插件, 兼 as 兼容空对象, 包 as 包装插件项, 取 as 取Task插件内部类型, B as 取Task插件类型, C as 取插件内部ts类型, 可 as 可调用接口逻辑, 合 as 合并插件结果, y as 常用延时直接形式转换器, 常 as 常用形式转换器, b as 接口, a as 接口方法类型, w as 接口结果转换器, 接 as 接口路径类型, m as 接口逻辑, l as 接口逻辑Base, j as 接口逻辑正确类型, i as 接口逻辑错误类型, k as 接口逻辑附加参数类型, 插 as 插件, A as 插件项类型, 服 as 服务器, 清 as 清理函数类型, 空 as 空对象, c as 获得接口方法类型, f as 获得接口正确形式, g as 获得接口结果转换器类型, h as 获得接口结果返回器类型, 获 as 获得接口路径类型, s as 获得接口逻辑上游接口类型, o as 获得接口逻辑插件类型, t as 获得接口逻辑最后接口类型, r as 获得接口逻辑正确类型, d as 获得接口逻辑类型, q as 获得接口逻辑错误类型, p as 获得接口逻辑附加参数类型, e as 获得接口错误形式, 计 as 计算接口逻辑参数, v as 计算接口逻辑正确结果, u as 计算接口逻辑错误结果, 请 as 请求附加参数类型 } from './interface-base-VXPI0A-u.cjs';
|
|
3
3
|
export { 任意接口结果返回器, 常用返回器, 接口结果返回器, 自定义返回器 } from './interface/interface-retuen.cjs';
|
|
4
4
|
export { 接口测试 } from './interface/interface-test.cjs';
|
|
5
|
-
export { 中文路径支持插件 } from './plugin/extend/chinese-path.cjs';
|
|
6
5
|
export { 自定义数据插件 } from './plugin/extend/custom-data.cjs';
|
|
7
6
|
export { JSON解析插件, 任意JSON解析插件, 任意JSON解析插件项, 合并JSON插件结果, 计算接口逻辑JSON参数 } from './plugin/extend/json.cjs';
|
|
8
7
|
export { 调试请求头插件 } from './plugin/extend/log-headers.cjs';
|
|
@@ -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;
|
|
@@ -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.
|
|
37
|
+
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
38
38
|
});
|
|
39
39
|
}, 3e4);
|
|
40
40
|
}
|
|
@@ -59,9 +59,9 @@ 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.
|
|
62
|
+
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
63
63
|
}
|
|
64
|
-
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.
|
|
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];
|
|
66
66
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
67
67
|
}
|
|
@@ -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.
|
|
77
|
+
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
|
-
|
|
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
|
}
|
|
@@ -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.
|
|
49
|
+
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
50
50
|
});
|
|
51
51
|
}, 3e4);
|
|
52
52
|
}
|
|
@@ -71,9 +71,9 @@ 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.
|
|
74
|
+
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
75
75
|
}
|
|
76
|
-
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.
|
|
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];
|
|
78
78
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
79
79
|
}
|
|
@@ -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.
|
|
89
|
+
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
|
-
|
|
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;
|