@lsby/net-core 0.7.25 → 0.7.27
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-type/bin.cjs +1 -1
- package/dist/bin/gen-api-type/index.cjs +1 -1
- package/dist/cjs/bin/gen-api-type/bin.cjs +1 -1
- package/dist/cjs/bin/gen-api-type/index.cjs +1 -1
- package/dist/cjs/global/global.cjs +4 -4
- package/dist/cjs/index.cjs +16 -15
- package/dist/cjs/plugin/extend/custom-data.cjs +4 -4
- package/dist/cjs/plugin/extend/urlencoded.cjs +4 -4
- package/dist/cjs/plugin/extend/web-socket.cjs +5 -5
- package/dist/cjs/server/server.cjs +15 -14
- 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/{chunk-SWPAN4RD.js → chunk-DEYULWUL.js} +1 -1
- package/dist/esm/{chunk-VNRSKOGV.js → chunk-E3Q2IM3N.js} +1 -1
- package/dist/esm/{chunk-CGLDW3PN.js → chunk-H4DSQ43S.js} +2 -2
- package/dist/esm/{chunk-2TMAYLLR.js → chunk-MCQJIHER.js} +1 -1
- package/dist/esm/{chunk-VTVWF3IE.js → chunk-Q3UCXVAN.js} +4 -4
- package/dist/esm/{chunk-GEQKQOFV.js → chunk-XRRSYNTD.js} +12 -11
- package/dist/esm/global/global.js +1 -1
- package/dist/esm/index.js +5 -5
- package/dist/esm/plugin/extend/custom-data.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/server/server.js +2 -2
- package/package.json +2 -2
|
@@ -180,7 +180,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
180
180
|
\u7C7B\u578B\u5B9A\u4E49\u7C7B\u578B = "aliasSymbol";
|
|
181
181
|
\u5BFC\u51FA\u7C7B\u578B\u5B9A\u4E49 = type.aliasSymbol.declarations?.[0]?.getText();
|
|
182
182
|
} else {
|
|
183
|
-
log.
|
|
183
|
+
log.warn(`\u65E0\u6CD5\u627E\u5230\u7C7B\u578B\u5B9A\u4E49`);
|
|
184
184
|
}
|
|
185
185
|
}
|
|
186
186
|
}
|
|
@@ -185,7 +185,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
185
185
|
\u7C7B\u578B\u5B9A\u4E49\u7C7B\u578B = "aliasSymbol";
|
|
186
186
|
\u5BFC\u51FA\u7C7B\u578B\u5B9A\u4E49 = type.aliasSymbol.declarations?.[0]?.getText();
|
|
187
187
|
} else {
|
|
188
|
-
log.
|
|
188
|
+
log.warn(`\u65E0\u6CD5\u627E\u5230\u7C7B\u578B\u5B9A\u4E49`);
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
191
|
}
|
|
@@ -180,7 +180,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
180
180
|
\u7C7B\u578B\u5B9A\u4E49\u7C7B\u578B = "aliasSymbol";
|
|
181
181
|
\u5BFC\u51FA\u7C7B\u578B\u5B9A\u4E49 = type.aliasSymbol.declarations?.[0]?.getText();
|
|
182
182
|
} else {
|
|
183
|
-
log.
|
|
183
|
+
log.warn(`\u65E0\u6CD5\u627E\u5230\u7C7B\u578B\u5B9A\u4E49`);
|
|
184
184
|
}
|
|
185
185
|
}
|
|
186
186
|
}
|
|
@@ -185,7 +185,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
185
185
|
\u7C7B\u578B\u5B9A\u4E49\u7C7B\u578B = "aliasSymbol";
|
|
186
186
|
\u5BFC\u51FA\u7C7B\u578B\u5B9A\u4E49 = type.aliasSymbol.declarations?.[0]?.getText();
|
|
187
187
|
} else {
|
|
188
|
-
log.
|
|
188
|
+
log.warn(`\u65E0\u6CD5\u627E\u5230\u7C7B\u578B\u5B9A\u4E49`);
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
191
|
}
|
|
@@ -33,7 +33,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
33
33
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
34
34
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
35
35
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
36
|
-
this.log.
|
|
36
|
+
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
37
37
|
});
|
|
38
38
|
}, 3e4);
|
|
39
39
|
}
|
|
@@ -58,9 +58,9 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
58
58
|
try {
|
|
59
59
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
60
60
|
} catch (err) {
|
|
61
|
-
this.log.
|
|
61
|
+
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
62
62
|
}
|
|
63
|
-
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.
|
|
63
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
64
64
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
65
65
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
66
66
|
}
|
|
@@ -73,7 +73,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
76
|
-
this.log.
|
|
76
|
+
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
};
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -319,7 +319,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
319
319
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
320
320
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
321
321
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
322
|
-
this.log.
|
|
322
|
+
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
323
323
|
});
|
|
324
324
|
}, 3e4);
|
|
325
325
|
}
|
|
@@ -344,9 +344,9 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
344
344
|
try {
|
|
345
345
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
346
346
|
} catch (err) {
|
|
347
|
-
this.log.
|
|
347
|
+
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
348
348
|
}
|
|
349
|
-
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.
|
|
349
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
350
350
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
351
351
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
352
352
|
}
|
|
@@ -359,7 +359,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
359
359
|
}
|
|
360
360
|
}
|
|
361
361
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
362
|
-
this.log.
|
|
362
|
+
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
363
363
|
}
|
|
364
364
|
}
|
|
365
365
|
};
|
|
@@ -540,7 +540,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
540
540
|
await new Promise((resolve, reject) => {
|
|
541
541
|
ws\u53E5\u67C4?.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
542
542
|
if (err !== void 0 && err !== null) {
|
|
543
|
-
log2.
|
|
543
|
+
log2.warn("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err });
|
|
544
544
|
return reject(err);
|
|
545
545
|
}
|
|
546
546
|
resolve();
|
|
@@ -643,14 +643,15 @@ var \u670D\u52A1\u5668 = class {
|
|
|
643
643
|
} else if (\u6B63\u786E\u7ED3\u679C.success === true) {
|
|
644
644
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
645
645
|
} else {
|
|
646
|
-
|
|
646
|
+
let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
|
|
647
|
+
await log2.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
|
|
647
648
|
await log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
648
649
|
await log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
649
|
-
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C
|
|
650
|
+
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
|
|
650
651
|
}
|
|
651
652
|
let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
652
653
|
await log2.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
|
|
653
|
-
await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", \u6700\u7EC8\u7ED3\u679C);
|
|
654
|
+
await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
|
|
654
655
|
\u5F00\u59CB = Date.now();
|
|
655
656
|
await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
|
|
656
657
|
let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
@@ -671,27 +672,27 @@ var \u670D\u52A1\u5668 = class {
|
|
|
671
672
|
});
|
|
672
673
|
wss.on("connection", async (ws, req) => {
|
|
673
674
|
let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
674
|
-
log2.
|
|
675
|
+
log2.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
675
676
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
676
677
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
677
|
-
log2.
|
|
678
|
+
log2.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
678
679
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
679
680
|
}
|
|
680
|
-
log2.
|
|
681
|
+
log2.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
681
682
|
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
682
683
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
683
684
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
684
|
-
log2.
|
|
685
|
+
log2.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
685
686
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
686
687
|
}
|
|
687
688
|
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
688
|
-
log2.
|
|
689
|
+
log2.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
689
690
|
ws.on("close", async () => {
|
|
690
|
-
log2.
|
|
691
|
+
log2.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
691
692
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
692
693
|
});
|
|
693
694
|
ws.on("error", async (err) => {
|
|
694
|
-
log2.
|
|
695
|
+
log2.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
695
696
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
696
697
|
});
|
|
697
698
|
});
|
|
@@ -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
|
};
|
|
@@ -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
|
};
|
|
@@ -36,7 +36,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
36
36
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
37
37
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
38
38
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
39
|
-
this.log.
|
|
39
|
+
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
40
40
|
});
|
|
41
41
|
}, 3e4);
|
|
42
42
|
}
|
|
@@ -61,9 +61,9 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
61
61
|
try {
|
|
62
62
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
63
63
|
} catch (err) {
|
|
64
|
-
this.log.
|
|
64
|
+
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
65
65
|
}
|
|
66
|
-
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.
|
|
66
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
67
67
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
68
68
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
69
69
|
}
|
|
@@ -76,7 +76,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
79
|
-
this.log.
|
|
79
|
+
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
};
|
|
@@ -139,7 +139,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
139
139
|
await new Promise((resolve, reject) => {
|
|
140
140
|
ws\u53E5\u67C4?.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
141
141
|
if (err !== void 0 && err !== null) {
|
|
142
|
-
log2.
|
|
142
|
+
log2.warn("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err });
|
|
143
143
|
return reject(err);
|
|
144
144
|
}
|
|
145
145
|
resolve();
|
|
@@ -49,7 +49,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
49
49
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
50
50
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
51
51
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
52
|
-
this.log.
|
|
52
|
+
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
53
53
|
});
|
|
54
54
|
}, 3e4);
|
|
55
55
|
}
|
|
@@ -74,9 +74,9 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
74
74
|
try {
|
|
75
75
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
76
76
|
} catch (err) {
|
|
77
|
-
this.log.
|
|
77
|
+
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
78
78
|
}
|
|
79
|
-
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.
|
|
79
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
80
80
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
81
81
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
82
82
|
}
|
|
@@ -89,7 +89,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
92
|
-
this.log.
|
|
92
|
+
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
};
|
|
@@ -193,14 +193,15 @@ var \u670D\u52A1\u5668 = class {
|
|
|
193
193
|
} else if (\u6B63\u786E\u7ED3\u679C.success === true) {
|
|
194
194
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
195
195
|
} else {
|
|
196
|
-
|
|
196
|
+
let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
|
|
197
|
+
await log2.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
|
|
197
198
|
await log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
198
199
|
await log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
199
|
-
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C
|
|
200
|
+
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
|
|
200
201
|
}
|
|
201
202
|
let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
202
203
|
await log2.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
|
|
203
|
-
await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", \u6700\u7EC8\u7ED3\u679C);
|
|
204
|
+
await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
|
|
204
205
|
\u5F00\u59CB = Date.now();
|
|
205
206
|
await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
|
|
206
207
|
let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
@@ -221,27 +222,27 @@ var \u670D\u52A1\u5668 = class {
|
|
|
221
222
|
});
|
|
222
223
|
wss.on("connection", async (ws, req) => {
|
|
223
224
|
let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
224
|
-
log2.
|
|
225
|
+
log2.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
225
226
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
226
227
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
227
|
-
log2.
|
|
228
|
+
log2.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
228
229
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
229
230
|
}
|
|
230
|
-
log2.
|
|
231
|
+
log2.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
231
232
|
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
232
233
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
233
234
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
234
|
-
log2.
|
|
235
|
+
log2.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
235
236
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
236
237
|
}
|
|
237
238
|
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
238
|
-
log2.
|
|
239
|
+
log2.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
239
240
|
ws.on("close", async () => {
|
|
240
|
-
log2.
|
|
241
|
+
log2.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
241
242
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
242
243
|
});
|
|
243
244
|
ws.on("error", async (err) => {
|
|
244
|
-
log2.
|
|
245
|
+
log2.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
245
246
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
246
247
|
});
|
|
247
248
|
});
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
} from "./chunk-43GZE5YL.js";
|
|
4
4
|
import {
|
|
5
5
|
Global
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-Q3UCXVAN.js";
|
|
7
7
|
|
|
8
8
|
// src/plugin/extend/web-socket.ts
|
|
9
9
|
import { WebSocket } from "ws";
|
|
@@ -47,7 +47,7 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
47
47
|
await new Promise((resolve, reject) => {
|
|
48
48
|
ws\u53E5\u67C4?.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
49
49
|
if (err !== void 0 && err !== null) {
|
|
50
|
-
log.
|
|
50
|
+
log.warn("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err });
|
|
51
51
|
return reject(err);
|
|
52
52
|
}
|
|
53
53
|
resolve();
|
|
@@ -151,7 +151,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
151
151
|
\u7C7B\u578B\u5B9A\u4E49\u7C7B\u578B = "aliasSymbol";
|
|
152
152
|
\u5BFC\u51FA\u7C7B\u578B\u5B9A\u4E49 = type.aliasSymbol.declarations?.[0]?.getText();
|
|
153
153
|
} else {
|
|
154
|
-
log.
|
|
154
|
+
log.warn(`\u65E0\u6CD5\u627E\u5230\u7C7B\u578B\u5B9A\u4E49`);
|
|
155
155
|
}
|
|
156
156
|
}
|
|
157
157
|
}
|
|
@@ -8,7 +8,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
8
8
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
9
9
|
this.\u5B9A\u65F6\u5668ID = setInterval(() => {
|
|
10
10
|
this.\u6E05\u7406\u65E0\u6548\u8FDE\u63A5().catch((err) => {
|
|
11
|
-
this.log.
|
|
11
|
+
this.log.error(`\u6E05\u7406\u65E0\u6548\u8FDE\u63A5\u5931\u8D25: ${err}`);
|
|
12
12
|
});
|
|
13
13
|
}, 3e4);
|
|
14
14
|
}
|
|
@@ -33,9 +33,9 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
33
33
|
try {
|
|
34
34
|
this.\u8FDE\u63A5\u8868[id]?.close(1e3, "\u670D\u52A1\u5668\u4E3B\u52A8\u5173\u95ED");
|
|
35
35
|
} catch (err) {
|
|
36
|
-
this.log.
|
|
36
|
+
this.log.error(`\u5173\u95ED WebSocket \u53E5\u67C4\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
37
37
|
}
|
|
38
|
-
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.
|
|
38
|
+
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
39
39
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
40
40
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
41
41
|
}
|
|
@@ -48,7 +48,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
if (\u6E05\u7406\u6570\u91CF > 0) {
|
|
51
|
-
this.log.
|
|
51
|
+
this.log.info(`\u6E05\u7406\u4E86 ${\u6E05\u7406\u6570\u91CF} \u4E2A\u65E0\u6548 WebSocket \u8FDE\u63A5`);
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Global
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-Q3UCXVAN.js";
|
|
4
4
|
import {
|
|
5
5
|
递归截断字符串
|
|
6
6
|
} from "./chunk-ZIVQ3WZA.js";
|
|
@@ -86,14 +86,15 @@ var \u670D\u52A1\u5668 = class {
|
|
|
86
86
|
} else if (\u6B63\u786E\u7ED3\u679C.success === true) {
|
|
87
87
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
88
88
|
} else {
|
|
89
|
-
|
|
89
|
+
let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
|
|
90
|
+
await log.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
|
|
90
91
|
await log.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
91
92
|
await log.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
92
|
-
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C
|
|
93
|
+
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
|
|
93
94
|
}
|
|
94
95
|
let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
95
96
|
await log.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
|
|
96
|
-
await log.debug("\u6700\u7EC8\u7ED3\u679C: %o", \u6700\u7EC8\u7ED3\u679C);
|
|
97
|
+
await log.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
|
|
97
98
|
\u5F00\u59CB = Date.now();
|
|
98
99
|
await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
|
|
99
100
|
let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
@@ -114,27 +115,27 @@ var \u670D\u52A1\u5668 = class {
|
|
|
114
115
|
});
|
|
115
116
|
wss.on("connection", async (ws, req) => {
|
|
116
117
|
let log = logBase.extend(short().new()).extend("WebSocket");
|
|
117
|
-
log.
|
|
118
|
+
log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
118
119
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
119
120
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
120
|
-
log.
|
|
121
|
+
log.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
121
122
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
122
123
|
}
|
|
123
|
-
log.
|
|
124
|
+
log.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
124
125
|
let WebSocket\u7BA1\u7406\u5668 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
125
126
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u5668.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
126
127
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
127
|
-
log.
|
|
128
|
+
log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
128
129
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
129
130
|
}
|
|
130
131
|
WebSocket\u7BA1\u7406\u5668.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
131
|
-
log.
|
|
132
|
+
log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
132
133
|
ws.on("close", async () => {
|
|
133
|
-
log.
|
|
134
|
+
log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
134
135
|
WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
135
136
|
});
|
|
136
137
|
ws.on("error", async (err) => {
|
|
137
|
-
log.
|
|
138
|
+
log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
138
139
|
WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
139
140
|
});
|
|
140
141
|
});
|
package/dist/esm/index.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import {
|
|
2
2
|
WebSocket插件
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-H4DSQ43S.js";
|
|
4
4
|
import {
|
|
5
5
|
中文路径支持插件
|
|
6
6
|
} from "./chunk-4BFNDHRC.js";
|
|
7
7
|
import {
|
|
8
8
|
自定义数据插件
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-E3Q2IM3N.js";
|
|
10
10
|
import {
|
|
11
11
|
JSON解析插件
|
|
12
12
|
} from "./chunk-GMYXAJS3.js";
|
|
@@ -21,7 +21,7 @@ import {
|
|
|
21
21
|
} from "./chunk-RRUUWHTF.js";
|
|
22
22
|
import {
|
|
23
23
|
表单解析插件
|
|
24
|
-
} from "./chunk-
|
|
24
|
+
} from "./chunk-DEYULWUL.js";
|
|
25
25
|
import {
|
|
26
26
|
常用延时直接形式接口封装
|
|
27
27
|
} from "./chunk-JXTWTY2S.js";
|
|
@@ -33,7 +33,7 @@ import {
|
|
|
33
33
|
} from "./chunk-43GZE5YL.js";
|
|
34
34
|
import {
|
|
35
35
|
服务器
|
|
36
|
-
} from "./chunk-
|
|
36
|
+
} from "./chunk-XRRSYNTD.js";
|
|
37
37
|
import {
|
|
38
38
|
EXPORT_TYPE
|
|
39
39
|
} from "./chunk-ZF7EC2OM.js";
|
|
@@ -49,7 +49,7 @@ import {
|
|
|
49
49
|
接口结果返回器,
|
|
50
50
|
自定义返回器
|
|
51
51
|
} from "./chunk-XBAKTT6S.js";
|
|
52
|
-
import "./chunk-
|
|
52
|
+
import "./chunk-Q3UCXVAN.js";
|
|
53
53
|
import {
|
|
54
54
|
构造元组,
|
|
55
55
|
构造对象
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lsby/net-core",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.27",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"require": "./dist/cjs/index.cjs",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@lsby/ts-global": "^0.0.8",
|
|
34
|
-
"@lsby/ts-log": "^0.
|
|
34
|
+
"@lsby/ts-log": "^0.2.0",
|
|
35
35
|
"commander": "^12.1.0",
|
|
36
36
|
"express": "^4.19.2",
|
|
37
37
|
"lodash": "^4.17.21",
|