@lsby/net-core 0.3.42 → 0.3.44
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/cjs/index.cjs +16 -11
- package/dist/cjs/interface/extend/json-base.cjs +4 -4
- package/dist/cjs/interface/extend/json-wrap.cjs +4 -4
- package/dist/cjs/plugin/extend/custom-data.cjs +39 -1
- package/dist/cjs/plugin/extend/custom-data.d.cts +1 -0
- package/dist/cjs/plugin/extend/web-socket.cjs +3 -3
- package/dist/cjs/result/result.cjs +4 -4
- package/dist/cjs/result/result.d.cts +6 -3
- package/dist/cjs/server/server.cjs +3 -3
- package/dist/esm/{chunk-F6MKRRVF.js → chunk-4V2TOQZ2.js} +4 -4
- package/dist/esm/{chunk-GAC4ETIB.js → chunk-AVB7KPZC.js} +6 -6
- package/dist/esm/{chunk-PVCULVI3.js → chunk-FAW4GTXP.js} +4 -4
- package/dist/esm/chunk-JX5MRJL6.js +22 -0
- package/dist/esm/{chunk-R3PAE6XG.js → chunk-UUUCTDAN.js} +3 -3
- package/dist/esm/{chunk-BVLGIDYF.js → chunk-WF7MUELD.js} +4 -4
- package/dist/esm/index.js +19 -19
- package/dist/esm/interface/extend/json-base.js +3 -3
- package/dist/esm/interface/extend/json-wrap.js +4 -4
- package/dist/esm/plugin/extend/custom-data.d.ts +1 -0
- package/dist/esm/plugin/extend/custom-data.js +3 -1
- package/dist/esm/plugin/extend/json.js +2 -2
- package/dist/esm/plugin/extend/urlencoded.js +2 -2
- package/dist/esm/plugin/extend/web-socket.js +2 -2
- package/dist/esm/result/result.d.ts +6 -3
- package/dist/esm/result/result.js +1 -1
- package/dist/esm/server/server.js +1 -1
- package/package.json +1 -1
- package/dist/esm/chunk-FDDCLNUD.js +0 -14
- package/dist/esm/{chunk-M52TXG2M.js → chunk-6AW5SSYA.js} +3 -3
- package/dist/esm/{chunk-M7QXZWBP.js → chunk-GVIGQG5Y.js} +3 -3
package/dist/cjs/index.cjs
CHANGED
|
@@ -258,8 +258,8 @@ var \u6B63\u786EJSON\u7ED3\u679C = class extends \u6B63\u786E\u7ED3\u679C {
|
|
|
258
258
|
this.data = data;
|
|
259
259
|
}
|
|
260
260
|
log = Global.getItem("log");
|
|
261
|
-
async run(req, res) {
|
|
262
|
-
let log = (await this.log).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
261
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
262
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).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
|
}
|
|
@@ -282,8 +282,8 @@ var \u9519\u8BEFJSON\u7ED3\u679C = class extends \u9519\u8BEF\u7ED3\u679C {
|
|
|
282
282
|
this.data = data;
|
|
283
283
|
}
|
|
284
284
|
log = Global.getItem("log");
|
|
285
|
-
async run(req, res) {
|
|
286
|
-
let log = (await this.log).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
285
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
286
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).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
|
}
|
|
@@ -416,8 +416,13 @@ var \u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6 = class extends \u63D2\u4EF
|
|
|
416
416
|
|
|
417
417
|
// src/plugin/extend/custom-data.ts
|
|
418
418
|
var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
419
|
+
log = Global.getItem("log");
|
|
419
420
|
constructor(t, data) {
|
|
420
|
-
super(t, async () =>
|
|
421
|
+
super(t, async (_res, _req, \u9644\u52A0\u53C2\u6570) => {
|
|
422
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).extend("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6");
|
|
423
|
+
await log.debug("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6\u8FD0\u884C, \u7ED3\u679C: %o", data);
|
|
424
|
+
return data;
|
|
425
|
+
});
|
|
421
426
|
}
|
|
422
427
|
};
|
|
423
428
|
|
|
@@ -488,7 +493,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
488
493
|
let ws\u53E5\u67C4 = null;
|
|
489
494
|
await log.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
490
495
|
if (typeof wsId == "string") {
|
|
491
|
-
await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4"
|
|
496
|
+
await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
|
|
492
497
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u80052.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
493
498
|
}
|
|
494
499
|
if (!ws\u53E5\u67C4) {
|
|
@@ -496,7 +501,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
496
501
|
return { ws\u64CD\u4F5C: void 0 };
|
|
497
502
|
}
|
|
498
503
|
let \u5B58\u5728\u7684ws\u53E5\u67C4 = ws\u53E5\u67C4;
|
|
499
|
-
await log.debug("WebSocket \u53E5\u67C4\u5DF2\u51C6\u5907\u597D"
|
|
504
|
+
await log.debug("WebSocket \u53E5\u67C4\u5DF2\u51C6\u5907\u597D");
|
|
500
505
|
return {
|
|
501
506
|
ws\u64CD\u4F5C: {
|
|
502
507
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
@@ -507,7 +512,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
507
512
|
log.err("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err }).catch(console.error);
|
|
508
513
|
return rej(err);
|
|
509
514
|
}
|
|
510
|
-
log.
|
|
515
|
+
log.debug("WebSocket \u4FE1\u606F\u53D1\u9001\u6210\u529F").catch(console.error);
|
|
511
516
|
return res();
|
|
512
517
|
});
|
|
513
518
|
});
|
|
@@ -539,7 +544,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
539
544
|
let app = (0, import_express3.default)();
|
|
540
545
|
app.use(async (req, res) => {
|
|
541
546
|
let \u8BF7\u6C42id = (0, import_short_uuid.default)().new();
|
|
542
|
-
let log = (await this.log).extend(
|
|
547
|
+
let log = (await this.log).extend(\u8BF7\u6C42id).extend("\u63A7\u5236\u5668");
|
|
543
548
|
try {
|
|
544
549
|
let \u8BF7\u6C42\u8DEF\u5F84 = req.path;
|
|
545
550
|
let \u8BF7\u6C42\u65B9\u6CD5 = req.method.toLowerCase();
|
|
@@ -560,7 +565,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
560
565
|
let \u63A5\u53E3\u7ED3\u679C = await \u76EE\u6807\u63A5\u53E3.\u63A5\u53E3\u5B9E\u73B0(\u63D2\u4EF6\u7ED3\u679C);
|
|
561
566
|
await log.debug("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
562
567
|
await log.debug("\u51C6\u5907\u6267\u884C\u8FD4\u56DE\u903B\u8F91...");
|
|
563
|
-
await \u63A5\u53E3\u7ED3\u679C.run(req, res);
|
|
568
|
+
await \u63A5\u53E3\u7ED3\u679C.run(req, res, { \u8BF7\u6C42id });
|
|
564
569
|
await log.debug("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
565
570
|
return;
|
|
566
571
|
}
|
|
@@ -587,7 +592,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
587
592
|
let server = app.listen(this.\u7AEF\u53E3);
|
|
588
593
|
let wss = new import_ws2.WebSocketServer({ server });
|
|
589
594
|
wss.on("connection", async (ws, req) => {
|
|
590
|
-
let log = (await this.log).extend(
|
|
595
|
+
let log = (await this.log).extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
591
596
|
await log.debug(`WebSocket \u8BF7\u6C42\u8FDE\u63A5: ${req.url}`);
|
|
592
597
|
let WebSocket\u7BA1\u7406\u80052 = await Global.getItem("WebSocket\u7BA1\u7406\u8005");
|
|
593
598
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1];
|
|
@@ -92,8 +92,8 @@ var \u6B63\u786EJSON\u7ED3\u679C = class extends \u6B63\u786E\u7ED3\u679C {
|
|
|
92
92
|
this.data = data;
|
|
93
93
|
}
|
|
94
94
|
log = Global.getItem("log");
|
|
95
|
-
async run(req, res) {
|
|
96
|
-
let log = (await this.log).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
95
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
96
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).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
|
}
|
|
@@ -107,8 +107,8 @@ var \u9519\u8BEFJSON\u7ED3\u679C = class extends \u9519\u8BEF\u7ED3\u679C {
|
|
|
107
107
|
this.data = data;
|
|
108
108
|
}
|
|
109
109
|
log = Global.getItem("log");
|
|
110
|
-
async run(req, res) {
|
|
111
|
-
let log = (await this.log).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
110
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
111
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).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
|
}
|
|
@@ -94,8 +94,8 @@ var \u6B63\u786EJSON\u7ED3\u679C = class extends \u6B63\u786E\u7ED3\u679C {
|
|
|
94
94
|
this.data = data;
|
|
95
95
|
}
|
|
96
96
|
log = Global.getItem("log");
|
|
97
|
-
async run(req, res) {
|
|
98
|
-
let log = (await this.log).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
97
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
98
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).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
|
}
|
|
@@ -109,8 +109,8 @@ var \u9519\u8BEFJSON\u7ED3\u679C = class extends \u9519\u8BEF\u7ED3\u679C {
|
|
|
109
109
|
this.data = data;
|
|
110
110
|
}
|
|
111
111
|
log = Global.getItem("log");
|
|
112
|
-
async run(req, res) {
|
|
113
|
-
let log = (await this.log).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
112
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
113
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).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
|
}
|
|
@@ -24,6 +24,39 @@ __export(custom_data_exports, {
|
|
|
24
24
|
});
|
|
25
25
|
module.exports = __toCommonJS(custom_data_exports);
|
|
26
26
|
|
|
27
|
+
// src/global/global.ts
|
|
28
|
+
var import_ts_global = require("@lsby/ts-global");
|
|
29
|
+
var import_ts_log = require("@lsby/ts-log");
|
|
30
|
+
|
|
31
|
+
// src/global/ws.ts
|
|
32
|
+
var WebSocket\u7BA1\u7406\u8005 = class {
|
|
33
|
+
constructor(\u8FDE\u63A5\u8868) {
|
|
34
|
+
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
35
|
+
}
|
|
36
|
+
async \u589E\u52A0\u8FDE\u63A5(\u8BF7\u6C42id, ws\u53E5\u67C4) {
|
|
37
|
+
this.\u8FDE\u63A5\u8868[\u8BF7\u6C42id] = ws\u53E5\u67C4;
|
|
38
|
+
}
|
|
39
|
+
async \u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u8BF7\u6C42id) {
|
|
40
|
+
return this.\u8FDE\u63A5\u8868[\u8BF7\u6C42id] == null ? false : true;
|
|
41
|
+
}
|
|
42
|
+
async \u83B7\u5F97\u53E5\u67C4(\u8BF7\u6C42id) {
|
|
43
|
+
return this.\u8FDE\u63A5\u8868[\u8BF7\u6C42id] || null;
|
|
44
|
+
}
|
|
45
|
+
async \u5220\u9664\u8FDE\u63A5(id) {
|
|
46
|
+
delete this.\u8FDE\u63A5\u8868[id];
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
// src/global/global.ts
|
|
51
|
+
var Global = new import_ts_global.GlobalService([
|
|
52
|
+
new import_ts_global.GlobalAsyncItem("log", async () => {
|
|
53
|
+
return new import_ts_log.Log("@lsby:net-core");
|
|
54
|
+
}),
|
|
55
|
+
new import_ts_global.GlobalAsyncItem("WebSocket\u7BA1\u7406\u8005", async () => {
|
|
56
|
+
return new WebSocket\u7BA1\u7406\u8005({});
|
|
57
|
+
})
|
|
58
|
+
]);
|
|
59
|
+
|
|
27
60
|
// src/plugin/plug.ts
|
|
28
61
|
var \u63D2\u4EF6 = class {
|
|
29
62
|
constructor(\u7C7B\u578B, \u5B9E\u73B0) {
|
|
@@ -40,8 +73,13 @@ var \u63D2\u4EF6 = class {
|
|
|
40
73
|
|
|
41
74
|
// src/plugin/extend/custom-data.ts
|
|
42
75
|
var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
76
|
+
log = Global.getItem("log");
|
|
43
77
|
constructor(t, data) {
|
|
44
|
-
super(t, async () =>
|
|
78
|
+
super(t, async (_res, _req, \u9644\u52A0\u53C2\u6570) => {
|
|
79
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).extend("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6");
|
|
80
|
+
await log.debug("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6\u8FD0\u884C, \u7ED3\u679C: %o", data);
|
|
81
|
+
return data;
|
|
82
|
+
});
|
|
45
83
|
}
|
|
46
84
|
};
|
|
47
85
|
// Annotate the CommonJS export names for ESM import in node:
|
|
@@ -90,7 +90,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
90
90
|
let ws\u53E5\u67C4 = null;
|
|
91
91
|
await log.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
92
92
|
if (typeof wsId == "string") {
|
|
93
|
-
await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4"
|
|
93
|
+
await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
|
|
94
94
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u80052.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
95
95
|
}
|
|
96
96
|
if (!ws\u53E5\u67C4) {
|
|
@@ -98,7 +98,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
98
98
|
return { ws\u64CD\u4F5C: void 0 };
|
|
99
99
|
}
|
|
100
100
|
let \u5B58\u5728\u7684ws\u53E5\u67C4 = ws\u53E5\u67C4;
|
|
101
|
-
await log.debug("WebSocket \u53E5\u67C4\u5DF2\u51C6\u5907\u597D"
|
|
101
|
+
await log.debug("WebSocket \u53E5\u67C4\u5DF2\u51C6\u5907\u597D");
|
|
102
102
|
return {
|
|
103
103
|
ws\u64CD\u4F5C: {
|
|
104
104
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
@@ -109,7 +109,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
109
109
|
log.err("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err }).catch(console.error);
|
|
110
110
|
return rej(err);
|
|
111
111
|
}
|
|
112
|
-
log.
|
|
112
|
+
log.debug("WebSocket \u4FE1\u606F\u53D1\u9001\u6210\u529F").catch(console.error);
|
|
113
113
|
return res();
|
|
114
114
|
});
|
|
115
115
|
});
|
|
@@ -97,8 +97,8 @@ var \u6B63\u786EJSON\u7ED3\u679C = class extends \u6B63\u786E\u7ED3\u679C {
|
|
|
97
97
|
this.data = data;
|
|
98
98
|
}
|
|
99
99
|
log = Global.getItem("log");
|
|
100
|
-
async run(req, res) {
|
|
101
|
-
let log = (await this.log).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
100
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
101
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).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
|
}
|
|
@@ -121,8 +121,8 @@ var \u9519\u8BEFJSON\u7ED3\u679C = class extends \u9519\u8BEF\u7ED3\u679C {
|
|
|
121
121
|
this.data = data;
|
|
122
122
|
}
|
|
123
123
|
log = Global.getItem("log");
|
|
124
|
-
async run(req, res) {
|
|
125
|
-
let log = (await this.log).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
124
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
125
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).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
|
}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { Request, Response } from 'express';
|
|
2
|
+
import { 附加参数类型 as ______ } from '../plugin/plug.cjs';
|
|
3
|
+
import 'zod';
|
|
4
|
+
import '@lsby/ts-fp-data';
|
|
2
5
|
|
|
3
6
|
declare abstract class 结果<T> {
|
|
4
7
|
protected readonly __类型保持符号?: T;
|
|
5
|
-
abstract run(req: Request, res: Response): Promise<void>;
|
|
8
|
+
abstract run(req: Request, res: Response, 附加参数: ______): Promise<void>;
|
|
6
9
|
}
|
|
7
10
|
declare abstract class 正确结果<T> extends 结果<T> {
|
|
8
11
|
private 正确结果烙印;
|
|
@@ -11,7 +14,7 @@ declare class 正确JSON结果<Data extends Record<string, unknown>> extends 正
|
|
|
11
14
|
private data;
|
|
12
15
|
private log;
|
|
13
16
|
constructor(data: Data);
|
|
14
|
-
run(req: Request, res: Response): Promise<void>;
|
|
17
|
+
run(req: Request, res: Response, 附加参数: ______): Promise<void>;
|
|
15
18
|
}
|
|
16
19
|
declare class 正确自定义结果 extends 正确结果<unknown> {
|
|
17
20
|
private customHandler;
|
|
@@ -25,7 +28,7 @@ declare class 错误JSON结果<Data> extends 错误结果<Data> {
|
|
|
25
28
|
private data;
|
|
26
29
|
private log;
|
|
27
30
|
constructor(data: Data);
|
|
28
|
-
run(req: Request, res: Response): Promise<void>;
|
|
31
|
+
run(req: Request, res: Response, 附加参数: ______): Promise<void>;
|
|
29
32
|
}
|
|
30
33
|
|
|
31
34
|
export { 正确JSON结果, 正确结果, 正确自定义结果, 结果, 错误JSON结果, 错误结果 };
|
|
@@ -83,7 +83,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
83
83
|
let app = (0, import_express.default)();
|
|
84
84
|
app.use(async (req, res) => {
|
|
85
85
|
let \u8BF7\u6C42id = (0, import_short_uuid.default)().new();
|
|
86
|
-
let log = (await this.log).extend(
|
|
86
|
+
let log = (await this.log).extend(\u8BF7\u6C42id).extend("\u63A7\u5236\u5668");
|
|
87
87
|
try {
|
|
88
88
|
let \u8BF7\u6C42\u8DEF\u5F84 = req.path;
|
|
89
89
|
let \u8BF7\u6C42\u65B9\u6CD5 = req.method.toLowerCase();
|
|
@@ -104,7 +104,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
104
104
|
let \u63A5\u53E3\u7ED3\u679C = await \u76EE\u6807\u63A5\u53E3.\u63A5\u53E3\u5B9E\u73B0(\u63D2\u4EF6\u7ED3\u679C);
|
|
105
105
|
await log.debug("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
106
106
|
await log.debug("\u51C6\u5907\u6267\u884C\u8FD4\u56DE\u903B\u8F91...");
|
|
107
|
-
await \u63A5\u53E3\u7ED3\u679C.run(req, res);
|
|
107
|
+
await \u63A5\u53E3\u7ED3\u679C.run(req, res, { \u8BF7\u6C42id });
|
|
108
108
|
await log.debug("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
109
109
|
return;
|
|
110
110
|
}
|
|
@@ -131,7 +131,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
131
131
|
let server = app.listen(this.\u7AEF\u53E3);
|
|
132
132
|
let wss = new import_ws2.WebSocketServer({ server });
|
|
133
133
|
wss.on("connection", async (ws, req) => {
|
|
134
|
-
let log = (await this.log).extend(
|
|
134
|
+
let log = (await this.log).extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
135
135
|
await log.debug(`WebSocket \u8BF7\u6C42\u8FDE\u63A5: ${req.url}`);
|
|
136
136
|
let WebSocket\u7BA1\u7406\u80052 = await Global.getItem("WebSocket\u7BA1\u7406\u8005");
|
|
137
137
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1];
|
|
@@ -17,8 +17,8 @@ var \u6B63\u786EJSON\u7ED3\u679C = class extends \u6B63\u786E\u7ED3\u679C {
|
|
|
17
17
|
this.data = data;
|
|
18
18
|
}
|
|
19
19
|
log = Global.getItem("log");
|
|
20
|
-
async run(req, res) {
|
|
21
|
-
let log = (await this.log).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
20
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
21
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).extend("\u6B63\u786EJSON\u7ED3\u679C");
|
|
22
22
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
23
23
|
res.send(this.data);
|
|
24
24
|
}
|
|
@@ -41,8 +41,8 @@ var \u9519\u8BEFJSON\u7ED3\u679C = class extends \u9519\u8BEF\u7ED3\u679C {
|
|
|
41
41
|
this.data = data;
|
|
42
42
|
}
|
|
43
43
|
log = Global.getItem("log");
|
|
44
|
-
async run(req, res) {
|
|
45
|
-
let log = (await this.log).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
44
|
+
async run(req, res, \u9644\u52A0\u53C2\u6570) {
|
|
45
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).extend("\u9519\u8BEFJSON\u7ED3\u679C");
|
|
46
46
|
await log.debug("\u8FD4\u56DE\u6570\u636E: %o", \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(this.data));
|
|
47
47
|
res.send(this.data);
|
|
48
48
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
Global
|
|
3
|
-
} from "./chunk-BC6IISWS.js";
|
|
4
1
|
import {
|
|
5
2
|
插件
|
|
6
3
|
} from "./chunk-43GZE5YL.js";
|
|
4
|
+
import {
|
|
5
|
+
Global
|
|
6
|
+
} from "./chunk-BC6IISWS.js";
|
|
7
7
|
|
|
8
8
|
// src/plugin/extend/web-socket.ts
|
|
9
9
|
import { z } from "zod";
|
|
@@ -24,7 +24,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
24
24
|
let ws\u53E5\u67C4 = null;
|
|
25
25
|
await log.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
26
26
|
if (typeof wsId == "string") {
|
|
27
|
-
await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4"
|
|
27
|
+
await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
|
|
28
28
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u8005.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
29
29
|
}
|
|
30
30
|
if (!ws\u53E5\u67C4) {
|
|
@@ -32,7 +32,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
32
32
|
return { ws\u64CD\u4F5C: void 0 };
|
|
33
33
|
}
|
|
34
34
|
let \u5B58\u5728\u7684ws\u53E5\u67C4 = ws\u53E5\u67C4;
|
|
35
|
-
await log.debug("WebSocket \u53E5\u67C4\u5DF2\u51C6\u5907\u597D"
|
|
35
|
+
await log.debug("WebSocket \u53E5\u67C4\u5DF2\u51C6\u5907\u597D");
|
|
36
36
|
return {
|
|
37
37
|
ws\u64CD\u4F5C: {
|
|
38
38
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
@@ -43,7 +43,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
43
43
|
log.err("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err }).catch(console.error);
|
|
44
44
|
return rej(err);
|
|
45
45
|
}
|
|
46
|
-
log.
|
|
46
|
+
log.debug("WebSocket \u4FE1\u606F\u53D1\u9001\u6210\u529F").catch(console.error);
|
|
47
47
|
return res();
|
|
48
48
|
});
|
|
49
49
|
});
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
正确JSON结果,
|
|
3
|
-
错误JSON结果
|
|
4
|
-
} from "./chunk-F6MKRRVF.js";
|
|
5
1
|
import {
|
|
6
2
|
接口
|
|
7
3
|
} from "./chunk-G4P3OAFL.js";
|
|
4
|
+
import {
|
|
5
|
+
正确JSON结果,
|
|
6
|
+
错误JSON结果
|
|
7
|
+
} from "./chunk-4V2TOQZ2.js";
|
|
8
8
|
|
|
9
9
|
// src/interface/extend/json-base.ts
|
|
10
10
|
var JSON\u63A5\u53E3 = class extends \u63A5\u53E3 {
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import {
|
|
2
|
+
插件
|
|
3
|
+
} from "./chunk-43GZE5YL.js";
|
|
4
|
+
import {
|
|
5
|
+
Global
|
|
6
|
+
} from "./chunk-BC6IISWS.js";
|
|
7
|
+
|
|
8
|
+
// src/plugin/extend/custom-data.ts
|
|
9
|
+
var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
10
|
+
log = Global.getItem("log");
|
|
11
|
+
constructor(t, data) {
|
|
12
|
+
super(t, async (_res, _req, \u9644\u52A0\u53C2\u6570) => {
|
|
13
|
+
let log = (await this.log).extend(\u9644\u52A0\u53C2\u6570.\u8BF7\u6C42id).extend("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6");
|
|
14
|
+
await log.debug("\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6\u8FD0\u884C, \u7ED3\u679C: %o", data);
|
|
15
|
+
return data;
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
export {
|
|
21
|
+
自定义数据插件
|
|
22
|
+
};
|
|
@@ -18,7 +18,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
18
18
|
let app = express();
|
|
19
19
|
app.use(async (req, res) => {
|
|
20
20
|
let \u8BF7\u6C42id = short().new();
|
|
21
|
-
let log = (await this.log).extend(
|
|
21
|
+
let log = (await this.log).extend(\u8BF7\u6C42id).extend("\u63A7\u5236\u5668");
|
|
22
22
|
try {
|
|
23
23
|
let \u8BF7\u6C42\u8DEF\u5F84 = req.path;
|
|
24
24
|
let \u8BF7\u6C42\u65B9\u6CD5 = req.method.toLowerCase();
|
|
@@ -39,7 +39,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
39
39
|
let \u63A5\u53E3\u7ED3\u679C = await \u76EE\u6807\u63A5\u53E3.\u63A5\u53E3\u5B9E\u73B0(\u63D2\u4EF6\u7ED3\u679C);
|
|
40
40
|
await log.debug("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
41
41
|
await log.debug("\u51C6\u5907\u6267\u884C\u8FD4\u56DE\u903B\u8F91...");
|
|
42
|
-
await \u63A5\u53E3\u7ED3\u679C.run(req, res);
|
|
42
|
+
await \u63A5\u53E3\u7ED3\u679C.run(req, res, { \u8BF7\u6C42id });
|
|
43
43
|
await log.debug("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
@@ -66,7 +66,7 @@ var \u670D\u52A1\u5668 = class {
|
|
|
66
66
|
let server = app.listen(this.\u7AEF\u53E3);
|
|
67
67
|
let wss = new WebSocketServer({ server });
|
|
68
68
|
wss.on("connection", async (ws, req) => {
|
|
69
|
-
let log = (await this.log).extend(
|
|
69
|
+
let log = (await this.log).extend(short().new()).extend("WebSocket");
|
|
70
70
|
await log.debug(`WebSocket \u8BF7\u6C42\u8FDE\u63A5: ${req.url}`);
|
|
71
71
|
let WebSocket\u7BA1\u7406\u8005 = await Global.getItem("WebSocket\u7BA1\u7406\u8005");
|
|
72
72
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1];
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import {
|
|
2
|
-
正确JSON结果,
|
|
3
|
-
错误JSON结果
|
|
4
|
-
} from "./chunk-F6MKRRVF.js";
|
|
5
1
|
import {
|
|
6
2
|
接口
|
|
7
3
|
} from "./chunk-G4P3OAFL.js";
|
|
8
4
|
import {
|
|
9
5
|
接口类型
|
|
10
6
|
} from "./chunk-SF5Z34AP.js";
|
|
7
|
+
import {
|
|
8
|
+
正确JSON结果,
|
|
9
|
+
错误JSON结果
|
|
10
|
+
} from "./chunk-4V2TOQZ2.js";
|
|
11
11
|
|
|
12
12
|
// src/interface/extend/json-wrap.ts
|
|
13
13
|
import { z } from "zod";
|
package/dist/esm/index.js
CHANGED
|
@@ -1,42 +1,34 @@
|
|
|
1
1
|
import {
|
|
2
2
|
WebSocket插件
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-AVB7KPZC.js";
|
|
4
4
|
import {
|
|
5
5
|
JSON接口
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-FAW4GTXP.js";
|
|
7
7
|
import {
|
|
8
8
|
JSON状态接口,
|
|
9
9
|
JSON状态接口类型
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-WF7MUELD.js";
|
|
11
11
|
import {
|
|
12
12
|
中文路径支持插件
|
|
13
13
|
} from "./chunk-47T4ZLNQ.js";
|
|
14
14
|
import {
|
|
15
15
|
自定义数据插件
|
|
16
|
-
} from "./chunk-
|
|
16
|
+
} from "./chunk-JX5MRJL6.js";
|
|
17
17
|
import {
|
|
18
18
|
JSON解析插件
|
|
19
|
-
} from "./chunk-
|
|
19
|
+
} from "./chunk-GVIGQG5Y.js";
|
|
20
20
|
import {
|
|
21
21
|
表单解析插件
|
|
22
|
-
} from "./chunk-
|
|
22
|
+
} from "./chunk-6AW5SSYA.js";
|
|
23
23
|
import {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
正确自定义结果,
|
|
27
|
-
结果,
|
|
28
|
-
错误JSON结果,
|
|
29
|
-
错误结果
|
|
30
|
-
} from "./chunk-F6MKRRVF.js";
|
|
24
|
+
插件
|
|
25
|
+
} from "./chunk-43GZE5YL.js";
|
|
31
26
|
import {
|
|
32
27
|
服务器
|
|
33
|
-
} from "./chunk-
|
|
34
|
-
import "./chunk-PVE5VI5K.js";
|
|
28
|
+
} from "./chunk-UUUCTDAN.js";
|
|
35
29
|
import {
|
|
36
30
|
业务行为
|
|
37
31
|
} from "./chunk-5WR5VNYH.js";
|
|
38
|
-
import "./chunk-BC6IISWS.js";
|
|
39
|
-
import "./chunk-EAVNASDB.js";
|
|
40
32
|
import {
|
|
41
33
|
接口
|
|
42
34
|
} from "./chunk-G4P3OAFL.js";
|
|
@@ -47,8 +39,16 @@ import {
|
|
|
47
39
|
接口类型
|
|
48
40
|
} from "./chunk-SF5Z34AP.js";
|
|
49
41
|
import {
|
|
50
|
-
|
|
51
|
-
|
|
42
|
+
正确JSON结果,
|
|
43
|
+
正确结果,
|
|
44
|
+
正确自定义结果,
|
|
45
|
+
结果,
|
|
46
|
+
错误JSON结果,
|
|
47
|
+
错误结果
|
|
48
|
+
} from "./chunk-4V2TOQZ2.js";
|
|
49
|
+
import "./chunk-PVE5VI5K.js";
|
|
50
|
+
import "./chunk-BC6IISWS.js";
|
|
51
|
+
import "./chunk-EAVNASDB.js";
|
|
52
52
|
export {
|
|
53
53
|
JSON\u63A5\u53E3,
|
|
54
54
|
JSON\u72B6\u6001\u63A5\u53E3,
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import {
|
|
2
2
|
JSON接口
|
|
3
|
-
} from "../../chunk-
|
|
4
|
-
import "../../chunk-
|
|
3
|
+
} from "../../chunk-FAW4GTXP.js";
|
|
4
|
+
import "../../chunk-G4P3OAFL.js";
|
|
5
|
+
import "../../chunk-4V2TOQZ2.js";
|
|
5
6
|
import "../../chunk-PVE5VI5K.js";
|
|
6
7
|
import "../../chunk-BC6IISWS.js";
|
|
7
8
|
import "../../chunk-EAVNASDB.js";
|
|
8
|
-
import "../../chunk-G4P3OAFL.js";
|
|
9
9
|
export {
|
|
10
10
|
JSON\u63A5\u53E3
|
|
11
11
|
};
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
2
|
JSON状态接口,
|
|
3
3
|
JSON状态接口类型
|
|
4
|
-
} from "../../chunk-
|
|
5
|
-
import "../../chunk-
|
|
4
|
+
} from "../../chunk-WF7MUELD.js";
|
|
5
|
+
import "../../chunk-G4P3OAFL.js";
|
|
6
|
+
import "../../chunk-SF5Z34AP.js";
|
|
7
|
+
import "../../chunk-4V2TOQZ2.js";
|
|
6
8
|
import "../../chunk-PVE5VI5K.js";
|
|
7
9
|
import "../../chunk-BC6IISWS.js";
|
|
8
10
|
import "../../chunk-EAVNASDB.js";
|
|
9
|
-
import "../../chunk-G4P3OAFL.js";
|
|
10
|
-
import "../../chunk-SF5Z34AP.js";
|
|
11
11
|
export {
|
|
12
12
|
JSON\u72B6\u6001\u63A5\u53E3,
|
|
13
13
|
JSON\u72B6\u6001\u63A5\u53E3\u7C7B\u578B
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
JSON解析插件
|
|
3
|
-
} from "../../chunk-
|
|
3
|
+
} from "../../chunk-GVIGQG5Y.js";
|
|
4
|
+
import "../../chunk-43GZE5YL.js";
|
|
4
5
|
import "../../chunk-PVE5VI5K.js";
|
|
5
6
|
import "../../chunk-BC6IISWS.js";
|
|
6
7
|
import "../../chunk-EAVNASDB.js";
|
|
7
|
-
import "../../chunk-43GZE5YL.js";
|
|
8
8
|
export {
|
|
9
9
|
JSON\u89E3\u6790\u63D2\u4EF6
|
|
10
10
|
};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import {
|
|
2
2
|
表单解析插件
|
|
3
|
-
} from "../../chunk-
|
|
3
|
+
} from "../../chunk-6AW5SSYA.js";
|
|
4
|
+
import "../../chunk-43GZE5YL.js";
|
|
4
5
|
import "../../chunk-BC6IISWS.js";
|
|
5
6
|
import "../../chunk-EAVNASDB.js";
|
|
6
|
-
import "../../chunk-43GZE5YL.js";
|
|
7
7
|
export {
|
|
8
8
|
\u8868\u5355\u89E3\u6790\u63D2\u4EF6
|
|
9
9
|
};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import {
|
|
2
2
|
WebSocket插件
|
|
3
|
-
} from "../../chunk-
|
|
3
|
+
} from "../../chunk-AVB7KPZC.js";
|
|
4
|
+
import "../../chunk-43GZE5YL.js";
|
|
4
5
|
import "../../chunk-BC6IISWS.js";
|
|
5
6
|
import "../../chunk-EAVNASDB.js";
|
|
6
|
-
import "../../chunk-43GZE5YL.js";
|
|
7
7
|
export {
|
|
8
8
|
WebSocket\u63D2\u4EF6
|
|
9
9
|
};
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { Request, Response } from 'express';
|
|
2
|
+
import { 附加参数类型 as ______ } from '../plugin/plug.js';
|
|
3
|
+
import 'zod';
|
|
4
|
+
import '@lsby/ts-fp-data';
|
|
2
5
|
|
|
3
6
|
declare abstract class 结果<T> {
|
|
4
7
|
protected readonly __类型保持符号?: T;
|
|
5
|
-
abstract run(req: Request, res: Response): Promise<void>;
|
|
8
|
+
abstract run(req: Request, res: Response, 附加参数: ______): Promise<void>;
|
|
6
9
|
}
|
|
7
10
|
declare abstract class 正确结果<T> extends 结果<T> {
|
|
8
11
|
private 正确结果烙印;
|
|
@@ -11,7 +14,7 @@ declare class 正确JSON结果<Data extends Record<string, unknown>> extends 正
|
|
|
11
14
|
private data;
|
|
12
15
|
private log;
|
|
13
16
|
constructor(data: Data);
|
|
14
|
-
run(req: Request, res: Response): Promise<void>;
|
|
17
|
+
run(req: Request, res: Response, 附加参数: ______): Promise<void>;
|
|
15
18
|
}
|
|
16
19
|
declare class 正确自定义结果 extends 正确结果<unknown> {
|
|
17
20
|
private customHandler;
|
|
@@ -25,7 +28,7 @@ declare class 错误JSON结果<Data> extends 错误结果<Data> {
|
|
|
25
28
|
private data;
|
|
26
29
|
private log;
|
|
27
30
|
constructor(data: Data);
|
|
28
|
-
run(req: Request, res: Response): Promise<void>;
|
|
31
|
+
run(req: Request, res: Response, 附加参数: ______): Promise<void>;
|
|
29
32
|
}
|
|
30
33
|
|
|
31
34
|
export { 正确JSON结果, 正确结果, 正确自定义结果, 结果, 错误JSON结果, 错误结果 };
|
package/package.json
CHANGED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
插件
|
|
3
|
-
} from "./chunk-43GZE5YL.js";
|
|
4
|
-
|
|
5
|
-
// src/plugin/extend/custom-data.ts
|
|
6
|
-
var \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
7
|
-
constructor(t, data) {
|
|
8
|
-
super(t, async () => data);
|
|
9
|
-
}
|
|
10
|
-
};
|
|
11
|
-
|
|
12
|
-
export {
|
|
13
|
-
自定义数据插件
|
|
14
|
-
};
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
+
import {
|
|
2
|
+
插件
|
|
3
|
+
} from "./chunk-43GZE5YL.js";
|
|
1
4
|
import {
|
|
2
5
|
递归截断字符串
|
|
3
6
|
} from "./chunk-PVE5VI5K.js";
|
|
4
7
|
import {
|
|
5
8
|
Global
|
|
6
9
|
} from "./chunk-BC6IISWS.js";
|
|
7
|
-
import {
|
|
8
|
-
插件
|
|
9
|
-
} from "./chunk-43GZE5YL.js";
|
|
10
10
|
|
|
11
11
|
// src/plugin/extend/json.ts
|
|
12
12
|
import { format } from "node:util";
|