@lsby/net-core 0.7.26 → 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 +12 -12
- 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 +11 -11
- 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-RSNOS5LV.js → chunk-XRRSYNTD.js} +10 -10
- package/dist/esm/global/global.js +1 -1
- package/dist/esm/index.js +9 -9
- 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();
|
|
@@ -672,27 +672,27 @@ var \u670D\u52A1\u5668 = class {
|
|
|
672
672
|
});
|
|
673
673
|
wss.on("connection", async (ws, req) => {
|
|
674
674
|
let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
675
|
-
log2.
|
|
675
|
+
log2.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
676
676
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
677
677
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
678
|
-
log2.
|
|
678
|
+
log2.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
679
679
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
680
680
|
}
|
|
681
|
-
log2.
|
|
681
|
+
log2.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
682
682
|
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
683
683
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
684
684
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
685
|
-
log2.
|
|
685
|
+
log2.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
686
686
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
687
687
|
}
|
|
688
688
|
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
689
|
-
log2.
|
|
689
|
+
log2.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
690
690
|
ws.on("close", async () => {
|
|
691
|
-
log2.
|
|
691
|
+
log2.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
692
692
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
693
693
|
});
|
|
694
694
|
ws.on("error", async (err) => {
|
|
695
|
-
log2.
|
|
695
|
+
log2.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
696
696
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
697
697
|
});
|
|
698
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
|
};
|
|
@@ -222,27 +222,27 @@ var \u670D\u52A1\u5668 = class {
|
|
|
222
222
|
});
|
|
223
223
|
wss.on("connection", async (ws, req) => {
|
|
224
224
|
let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
225
|
-
log2.
|
|
225
|
+
log2.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
226
226
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
227
227
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
228
|
-
log2.
|
|
228
|
+
log2.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
229
229
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
230
230
|
}
|
|
231
|
-
log2.
|
|
231
|
+
log2.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
232
232
|
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
233
233
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
234
234
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
235
|
-
log2.
|
|
235
|
+
log2.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
236
236
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
237
237
|
}
|
|
238
238
|
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
239
|
-
log2.
|
|
239
|
+
log2.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
240
240
|
ws.on("close", async () => {
|
|
241
|
-
log2.
|
|
241
|
+
log2.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
242
242
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
243
243
|
});
|
|
244
244
|
ws.on("error", async (err) => {
|
|
245
|
-
log2.
|
|
245
|
+
log2.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
246
246
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
247
247
|
});
|
|
248
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,9 +1,9 @@
|
|
|
1
|
+
import {
|
|
2
|
+
Global
|
|
3
|
+
} from "./chunk-Q3UCXVAN.js";
|
|
1
4
|
import {
|
|
2
5
|
递归截断字符串
|
|
3
6
|
} from "./chunk-ZIVQ3WZA.js";
|
|
4
|
-
import {
|
|
5
|
-
Global
|
|
6
|
-
} from "./chunk-VTVWF3IE.js";
|
|
7
7
|
|
|
8
8
|
// src/server/server.ts
|
|
9
9
|
import express from "express";
|
|
@@ -115,27 +115,27 @@ var \u670D\u52A1\u5668 = class {
|
|
|
115
115
|
});
|
|
116
116
|
wss.on("connection", async (ws, req) => {
|
|
117
117
|
let log = logBase.extend(short().new()).extend("WebSocket");
|
|
118
|
-
log.
|
|
118
|
+
log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
119
119
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
120
120
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
121
|
-
log.
|
|
121
|
+
log.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
122
122
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
123
123
|
}
|
|
124
|
-
log.
|
|
124
|
+
log.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
125
125
|
let WebSocket\u7BA1\u7406\u5668 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
126
126
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u5668.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
127
127
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
128
|
-
log.
|
|
128
|
+
log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
129
129
|
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
130
130
|
}
|
|
131
131
|
WebSocket\u7BA1\u7406\u5668.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
132
|
-
log.
|
|
132
|
+
log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
133
133
|
ws.on("close", async () => {
|
|
134
|
-
log.
|
|
134
|
+
log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
135
135
|
WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
136
136
|
});
|
|
137
137
|
ws.on("error", async (err) => {
|
|
138
|
-
log.
|
|
138
|
+
log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
139
139
|
WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
140
140
|
});
|
|
141
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,8 +21,10 @@ import {
|
|
|
21
21
|
} from "./chunk-RRUUWHTF.js";
|
|
22
22
|
import {
|
|
23
23
|
表单解析插件
|
|
24
|
-
} from "./chunk-
|
|
25
|
-
import
|
|
24
|
+
} from "./chunk-DEYULWUL.js";
|
|
25
|
+
import {
|
|
26
|
+
常用延时直接形式接口封装
|
|
27
|
+
} from "./chunk-JXTWTY2S.js";
|
|
26
28
|
import {
|
|
27
29
|
接口测试
|
|
28
30
|
} from "./chunk-N7TPWCQ5.js";
|
|
@@ -31,30 +33,28 @@ import {
|
|
|
31
33
|
} from "./chunk-43GZE5YL.js";
|
|
32
34
|
import {
|
|
33
35
|
服务器
|
|
34
|
-
} from "./chunk-
|
|
36
|
+
} from "./chunk-XRRSYNTD.js";
|
|
35
37
|
import {
|
|
36
38
|
EXPORT_TYPE
|
|
37
39
|
} from "./chunk-ZF7EC2OM.js";
|
|
40
|
+
import "./chunk-XPFEAXE4.js";
|
|
38
41
|
import {
|
|
39
42
|
常用形式并自定义返回接口封装
|
|
40
43
|
} from "./chunk-LZOZF4CS.js";
|
|
41
44
|
import {
|
|
42
45
|
常用形式接口封装
|
|
43
46
|
} from "./chunk-WECMWUFB.js";
|
|
44
|
-
import {
|
|
45
|
-
常用延时直接形式接口封装
|
|
46
|
-
} from "./chunk-JXTWTY2S.js";
|
|
47
47
|
import {
|
|
48
48
|
常用返回器,
|
|
49
49
|
接口结果返回器,
|
|
50
50
|
自定义返回器
|
|
51
51
|
} from "./chunk-XBAKTT6S.js";
|
|
52
|
+
import "./chunk-Q3UCXVAN.js";
|
|
52
53
|
import {
|
|
53
54
|
构造元组,
|
|
54
55
|
构造对象
|
|
55
56
|
} from "./chunk-YMH6HJJF.js";
|
|
56
57
|
import "./chunk-ZIVQ3WZA.js";
|
|
57
|
-
import "./chunk-VTVWF3IE.js";
|
|
58
58
|
import {
|
|
59
59
|
接口
|
|
60
60
|
} from "./chunk-MDUWXEQ7.js";
|
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",
|