@lsby/net-core 0.7.11-beta.1 → 0.7.11-beta.3
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 +5 -10
- package/dist/bin/gen-api-list/index.cjs +5 -10
- package/dist/bin/gen-api-type/bin.cjs +4 -8
- package/dist/bin/gen-api-type/index.cjs +4 -8
- package/dist/bin/gen-test/bin.cjs +6 -12
- package/dist/bin/gen-test/index.cjs +6 -12
- package/dist/cjs/action/action.bak.cjs +6 -12
- package/dist/cjs/bin/gen-api-list/bin.cjs +5 -10
- package/dist/cjs/bin/gen-api-list/index.cjs +5 -10
- package/dist/cjs/bin/gen-api-type/bin.cjs +4 -8
- package/dist/cjs/bin/gen-api-type/index.cjs +4 -8
- package/dist/cjs/bin/gen-test/bin.cjs +6 -12
- package/dist/cjs/bin/gen-test/index.cjs +6 -12
- package/dist/cjs/global/global.cjs +8 -10
- package/dist/cjs/global/global.d.cts +15 -4
- package/dist/cjs/help/interior.cjs +4 -8
- package/dist/cjs/index.cjs +74 -83
- package/dist/cjs/interface/interface-logic.cjs +1 -2
- package/dist/cjs/plugin/extend/custom-data.cjs +6 -10
- package/dist/cjs/plugin/extend/json.cjs +4 -8
- package/dist/cjs/plugin/extend/query.cjs +4 -8
- package/dist/cjs/plugin/extend/urlencoded.cjs +6 -10
- package/dist/cjs/plugin/extend/web-socket.cjs +16 -20
- package/dist/cjs/server/server.cjs +39 -47
- package/dist/esm/action/action.bak.js +6 -12
- package/dist/esm/bin/gen-api-list/bin.js +2 -2
- package/dist/esm/bin/gen-api-list/index.js +1 -1
- package/dist/esm/bin/gen-api-type/bin.js +2 -2
- package/dist/esm/bin/gen-api-type/index.js +1 -1
- package/dist/esm/bin/gen-test/bin.js +2 -2
- package/dist/esm/bin/gen-test/index.js +1 -1
- package/dist/esm/{chunk-47T4ZLNQ.js → chunk-4BFNDHRC.js} +1 -1
- package/dist/esm/{chunk-DV3NLRIF.js → chunk-AFWSZAXR.js} +9 -15
- package/dist/esm/{chunk-2JQ7AEO4.js → chunk-AY6KWNWX.js} +2 -2
- package/dist/esm/{chunk-7YSXFQXB.js → chunk-BFL3HOQE.js} +7 -9
- package/dist/esm/{chunk-DWJEBJWU.js → chunk-BHMLNO54.js} +7 -11
- package/dist/esm/{chunk-2I2MJFB2.js → chunk-GMYXAJS3.js} +2 -2
- package/dist/esm/{chunk-DI6KYJ65.js → chunk-LZKS5TUK.js} +1 -2
- package/dist/esm/{chunk-BBDALATZ.js → chunk-RT54DDSM.js} +6 -6
- package/dist/esm/{chunk-VZH2ETK3.js → chunk-TD5W3AAH.js} +1 -1
- package/dist/esm/{chunk-Y2ZVCJPE.js → chunk-UKAZDGUR.js} +8 -13
- package/dist/esm/{chunk-TN3QCUBD.js → chunk-VFOG5LBT.js} +1 -1
- package/dist/esm/{chunk-O2ZDZKFT.js → chunk-YITJBWMM.js} +2 -2
- package/dist/esm/{chunk-NMG5C5AS.js → chunk-ZIVQ3WZA.js} +4 -8
- package/dist/esm/global/global.d.ts +15 -4
- package/dist/esm/global/global.js +5 -3
- package/dist/esm/help/interior.js +1 -1
- package/dist/esm/index.js +19 -19
- package/dist/esm/interface/interface-logic.js +1 -1
- package/dist/esm/plugin/extend/chinese-path.js +1 -1
- package/dist/esm/plugin/extend/custom-data.js +2 -2
- package/dist/esm/plugin/extend/json.js +2 -2
- package/dist/esm/plugin/extend/query.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 +3 -3
- package/dist/esm/wrapper/common-wrapper.js +2 -2
- package/dist/esm/wrapper/deferred-result-wrapper.js +2 -2
- package/package.json +2 -2
- package/dist/cjs/global/web-socket-management.cjs +0 -71
- package/dist/cjs/global/web-socket-management.d.cts +0 -16
- package/dist/esm/global/web-socket-management.d.ts +0 -16
- package/dist/esm/global/web-socket-management.js +0 -6
- package/dist/esm/{chunk-WYJFP5V5.js → chunk-FEURUNOT.js} +3 -3
- package/dist/esm/{chunk-FHU5AZWT.js → chunk-JLHGWUH6.js} +3 -3
|
@@ -29,13 +29,12 @@ var import_zod = require("zod");
|
|
|
29
29
|
// src/global/global.ts
|
|
30
30
|
var import_ts_global = require("@lsby/ts-global");
|
|
31
31
|
var import_ts_log = require("@lsby/ts-log");
|
|
32
|
-
|
|
33
|
-
// src/global/web-socket-management.ts
|
|
32
|
+
var log = new import_ts_log.Log("@lsby:net-core");
|
|
34
33
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
35
34
|
constructor(\u8FDE\u63A5\u8868) {
|
|
36
35
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
37
36
|
}
|
|
38
|
-
log =
|
|
37
|
+
log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
39
38
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
40
39
|
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
41
40
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
@@ -44,8 +43,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
44
43
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
45
44
|
}
|
|
46
45
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
47
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
48
|
-
return;
|
|
46
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
49
47
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
50
48
|
}
|
|
51
49
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
@@ -63,10 +61,8 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
63
61
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
64
62
|
}
|
|
65
63
|
};
|
|
66
|
-
|
|
67
|
-
// src/global/global.ts
|
|
68
64
|
var Global = new import_ts_global.GlobalService([
|
|
69
|
-
new import_ts_global.GlobalItem("log",
|
|
65
|
+
new import_ts_global.GlobalItem("log", log),
|
|
70
66
|
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
71
67
|
]);
|
|
72
68
|
|
|
@@ -97,49 +93,49 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
97
93
|
}).or(import_zod.z.null())
|
|
98
94
|
}),
|
|
99
95
|
async (req, _res, \u9644\u52A0\u53C2\u6570) => {
|
|
100
|
-
let
|
|
96
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("webSocket\u63D2\u4EF6");
|
|
101
97
|
let WebSocket\u7BA1\u7406\u56682 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
|
|
102
98
|
let ws\u53E5\u67C4 = null;
|
|
103
99
|
let wsId = req.headers["ws-client-id"];
|
|
104
|
-
await
|
|
100
|
+
await log2.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
|
|
105
101
|
if (typeof wsId !== "string") {
|
|
106
|
-
await
|
|
102
|
+
await log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket Id");
|
|
107
103
|
return { ws\u64CD\u4F5C: null };
|
|
108
104
|
}
|
|
109
|
-
await
|
|
105
|
+
await log2.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
|
|
110
106
|
return {
|
|
111
107
|
ws\u64CD\u4F5C: {
|
|
112
108
|
async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
|
|
113
109
|
if (ws\u53E5\u67C4 === null) {
|
|
114
|
-
await
|
|
110
|
+
await log2.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
|
|
115
111
|
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
116
112
|
}
|
|
117
113
|
if (ws\u53E5\u67C4 === null) {
|
|
118
|
-
await
|
|
114
|
+
await log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
|
|
119
115
|
return;
|
|
120
116
|
}
|
|
121
117
|
if (ws\u53E5\u67C4.readyState !== import_ws.WebSocket.OPEN) {
|
|
122
|
-
await
|
|
118
|
+
await log2.warn("WebSocket \u672A\u6253\u5F00\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F", { wsId });
|
|
123
119
|
return;
|
|
124
120
|
}
|
|
125
|
-
await
|
|
121
|
+
await log2.debug("\u53D1\u9001 WebSocket \u4FE1\u606F", { \u4FE1\u606F });
|
|
126
122
|
await new Promise((resolve, reject) => {
|
|
127
123
|
ws\u53E5\u67C4?.send(JSON.stringify(\u4FE1\u606F), (err) => {
|
|
128
124
|
if (err !== void 0 && err !== null) {
|
|
129
|
-
|
|
125
|
+
log2.warnSync("\u53D1\u9001 WebSocket \u4FE1\u606F\u5931\u8D25", { \u9519\u8BEF: err });
|
|
130
126
|
return reject(err);
|
|
131
127
|
}
|
|
132
|
-
|
|
128
|
+
log2.debugSync("WebSocket \u4FE1\u606F\u53D1\u9001\u6210\u529F");
|
|
133
129
|
resolve();
|
|
134
130
|
});
|
|
135
131
|
});
|
|
136
132
|
},
|
|
137
133
|
async \u5173\u95EDws\u8FDE\u63A5() {
|
|
138
|
-
await
|
|
134
|
+
await log2.debug("\u5173\u95ED WebSocket \u8FDE\u63A5", { wsId });
|
|
139
135
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(wsId);
|
|
140
136
|
},
|
|
141
137
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u6E05\u7406\u51FD\u6570) {
|
|
142
|
-
await
|
|
138
|
+
await log2.debug("\u8BBE\u7F6E WebSocket \u6E05\u7406\u51FD\u6570", { wsId });
|
|
143
139
|
await WebSocket\u7BA1\u7406\u56682.\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(wsId, \u6E05\u7406\u51FD\u6570);
|
|
144
140
|
}
|
|
145
141
|
}
|
|
@@ -42,13 +42,12 @@ var import_ws = require("ws");
|
|
|
42
42
|
// src/global/global.ts
|
|
43
43
|
var import_ts_global = require("@lsby/ts-global");
|
|
44
44
|
var import_ts_log = require("@lsby/ts-log");
|
|
45
|
-
|
|
46
|
-
// src/global/web-socket-management.ts
|
|
45
|
+
var log = new import_ts_log.Log("@lsby:net-core");
|
|
47
46
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
48
47
|
constructor(\u8FDE\u63A5\u8868) {
|
|
49
48
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
50
49
|
}
|
|
51
|
-
log =
|
|
50
|
+
log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
52
51
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
53
52
|
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
54
53
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
@@ -57,8 +56,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
57
56
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
58
57
|
}
|
|
59
58
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
60
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
61
|
-
return;
|
|
59
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
62
60
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
63
61
|
}
|
|
64
62
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
@@ -76,30 +74,24 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
76
74
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
77
75
|
}
|
|
78
76
|
};
|
|
79
|
-
|
|
80
|
-
// src/global/global.ts
|
|
81
77
|
var Global = new import_ts_global.GlobalService([
|
|
82
|
-
new import_ts_global.GlobalItem("log",
|
|
78
|
+
new import_ts_global.GlobalItem("log", log),
|
|
83
79
|
new import_ts_global.GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
84
80
|
]);
|
|
85
81
|
|
|
86
82
|
// src/help/interior.ts
|
|
87
83
|
function \u622A\u65AD\u5B57\u7B26\u4E32(\u5185\u5BB9) {
|
|
88
84
|
let \u6700\u5927\u65E5\u5FD7\u957F\u5EA6 = 1e3;
|
|
89
|
-
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6)
|
|
90
|
-
return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
85
|
+
if (\u5185\u5BB9.length > \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) return \u5185\u5BB9.slice(0, \u6700\u5927\u65E5\u5FD7\u957F\u5EA6) + "...";
|
|
91
86
|
return \u5185\u5BB9;
|
|
92
87
|
}
|
|
93
88
|
function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
94
|
-
if (typeof \u6570\u636E === "string")
|
|
95
|
-
|
|
96
|
-
if (Array.isArray(\u6570\u636E))
|
|
97
|
-
return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
89
|
+
if (typeof \u6570\u636E === "string") return \u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E);
|
|
90
|
+
if (Array.isArray(\u6570\u636E)) return \u6570\u636E.map((\u9879) => \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u9879));
|
|
98
91
|
if (typeof \u6570\u636E === "object" && \u6570\u636E !== null) {
|
|
99
92
|
let \u65B0\u6570\u636E = {};
|
|
100
93
|
for (let key in \u6570\u636E) {
|
|
101
|
-
if (\u6570\u636E.hasOwnProperty(key) === true)
|
|
102
|
-
\u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
94
|
+
if (\u6570\u636E.hasOwnProperty(key) === true) \u65B0\u6570\u636E[key] = \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E[key]);
|
|
103
95
|
}
|
|
104
96
|
return \u65B0\u6570\u636E;
|
|
105
97
|
}
|
|
@@ -116,10 +108,10 @@ var \u670D\u52A1\u5668 = class {
|
|
|
116
108
|
}
|
|
117
109
|
log = Global.getItem("log");
|
|
118
110
|
async run() {
|
|
119
|
-
let
|
|
111
|
+
let log2 = (await this.log).extend("\u670D\u52A1\u5668");
|
|
120
112
|
let app = (0, import_express.default)();
|
|
121
113
|
if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
|
|
122
|
-
await
|
|
114
|
+
await log2.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
|
|
123
115
|
app.use(import_express.default.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
|
|
124
116
|
}
|
|
125
117
|
app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
|
|
@@ -130,11 +122,11 @@ var \u670D\u52A1\u5668 = class {
|
|
|
130
122
|
async \u5904\u7406\u8BF7\u6C42(req, res) {
|
|
131
123
|
let \u8BF7\u6C42id = (0, import_short_uuid.default)().new();
|
|
132
124
|
let \u4E3Blog = (await this.log).extend(\u8BF7\u6C42id);
|
|
133
|
-
let
|
|
125
|
+
let log2 = \u4E3Blog.extend("\u63A7\u5236\u5668");
|
|
134
126
|
try {
|
|
135
127
|
let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
|
|
136
128
|
let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
|
|
137
|
-
await
|
|
129
|
+
await log2.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
138
130
|
let \u76EE\u6807\u63A5\u53E3 = this.\u63A5\u53E3\u4EEC.find((\u63A5\u53E3) => \u8BF7\u6C42\u65B9\u6CD5 === \u63A5\u53E3.\u83B7\u5F97\u65B9\u6CD5() && \u8BF7\u6C42\u8DEF\u5F84 === \u63A5\u53E3.\u83B7\u5F97\u8DEF\u5F84()) ?? null;
|
|
139
131
|
if (\u76EE\u6807\u63A5\u53E3 !== null) {
|
|
140
132
|
await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, { log: \u4E3Blog });
|
|
@@ -146,23 +138,23 @@ var \u670D\u52A1\u5668 = class {
|
|
|
146
138
|
res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
|
|
147
139
|
return;
|
|
148
140
|
} catch (e) {
|
|
149
|
-
await
|
|
141
|
+
await log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
|
|
150
142
|
}
|
|
151
143
|
}
|
|
152
|
-
await
|
|
144
|
+
await log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
|
|
153
145
|
res.status(404).end();
|
|
154
146
|
} catch (error) {
|
|
155
|
-
await
|
|
147
|
+
await log2.error(error);
|
|
156
148
|
res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
|
|
157
149
|
}
|
|
158
150
|
}
|
|
159
151
|
async \u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) {
|
|
160
|
-
let
|
|
152
|
+
let log2 = \u8BF7\u6C42\u9644\u52A0\u53C2\u6570.log.extend("\u5904\u7406\u63A5\u53E3\u903B\u8F91");
|
|
161
153
|
let \u63A5\u53E3\u903B\u8F91 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u903B\u8F91();
|
|
162
154
|
let \u7ED3\u679C\u8F6C\u6362\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8F6C\u6362\u5668();
|
|
163
|
-
await
|
|
155
|
+
await log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
|
|
164
156
|
let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F91.\u8FD0\u884C(req, res, {}, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
165
|
-
await
|
|
157
|
+
await log2.debug("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
166
158
|
let \u6700\u7EC8\u7ED3\u679C;
|
|
167
159
|
let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
|
|
168
160
|
let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
|
|
@@ -172,55 +164,55 @@ var \u670D\u52A1\u5668 = class {
|
|
|
172
164
|
} else if (\u6B63\u786E\u7ED3\u679C.success === true) {
|
|
173
165
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
174
166
|
} else {
|
|
175
|
-
await
|
|
176
|
-
await
|
|
177
|
-
await
|
|
167
|
+
await log2.error("\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C");
|
|
168
|
+
await log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
169
|
+
await log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
178
170
|
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C))}`);
|
|
179
171
|
}
|
|
180
|
-
await
|
|
172
|
+
await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", \u6700\u7EC8\u7ED3\u679C);
|
|
181
173
|
res.send(\u6700\u7EC8\u7ED3\u679C);
|
|
182
|
-
await
|
|
174
|
+
await log2.debug("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5");
|
|
183
175
|
}
|
|
184
176
|
async \u521D\u59CB\u5316WebSocket(server) {
|
|
185
177
|
let wss = new import_ws.WebSocketServer({ server });
|
|
186
178
|
let logBase = await this.log;
|
|
187
179
|
wss.on("listening", async () => {
|
|
188
|
-
let
|
|
189
|
-
await
|
|
180
|
+
let log2 = logBase;
|
|
181
|
+
await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
|
|
190
182
|
});
|
|
191
183
|
wss.on("error", async (err) => {
|
|
192
|
-
let
|
|
193
|
-
await
|
|
184
|
+
let log2 = logBase;
|
|
185
|
+
await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
|
|
194
186
|
});
|
|
195
187
|
wss.on("connection", async (ws, req) => {
|
|
196
|
-
let
|
|
197
|
-
|
|
188
|
+
let log2 = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
|
|
189
|
+
log2.debugSync("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
198
190
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
199
191
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
200
|
-
|
|
201
|
-
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws,
|
|
192
|
+
log2.errorSync("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
193
|
+
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
202
194
|
}
|
|
203
|
-
|
|
195
|
+
log2.debugSync("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
204
196
|
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
205
197
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
206
198
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
207
|
-
|
|
208
|
-
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws,
|
|
199
|
+
log2.errorSync("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
200
|
+
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
209
201
|
}
|
|
210
202
|
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
211
|
-
|
|
203
|
+
log2.infoSync("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
212
204
|
ws.on("close", async () => {
|
|
213
|
-
|
|
205
|
+
log2.infoSync("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
214
206
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
215
207
|
});
|
|
216
208
|
ws.on("error", async (err) => {
|
|
217
|
-
|
|
209
|
+
log2.errorSync("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
218
210
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
219
211
|
});
|
|
220
212
|
});
|
|
221
213
|
}
|
|
222
|
-
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws,
|
|
223
|
-
await
|
|
214
|
+
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, code, reason) {
|
|
215
|
+
await log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
|
|
224
216
|
ws.close(code, reason);
|
|
225
217
|
}
|
|
226
218
|
\u83B7\u53D6\u672C\u5730\u5730\u5740() {
|
|
@@ -40,8 +40,7 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
40
40
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
41
41
|
let \u6240\u6709\u7ED3\u679C = await Promise.all(arr.map((a) => a.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570)));
|
|
42
42
|
let \u9519\u8BEF = \u6240\u6709\u7ED3\u679C.filter((a) => a.isLeft())[0] ?? null;
|
|
43
|
-
if (\u9519\u8BEF !== null)
|
|
44
|
-
return \u9519\u8BEF;
|
|
43
|
+
if (\u9519\u8BEF !== null) return \u9519\u8BEF;
|
|
45
44
|
let \u6B63\u786E\u7ED3\u679C\u5408\u5E76 = \u6240\u6709\u7ED3\u679C.map((a) => a.assertRight().getRight()).reduce((s, a) => Object.assign(s, a), {});
|
|
46
45
|
return new Right(await f(\u6B63\u786E\u7ED3\u679C\u5408\u5E76));
|
|
47
46
|
});
|
|
@@ -79,8 +78,7 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
79
78
|
\u6D41\u5F0F\u7EC4\u5408(b) {
|
|
80
79
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
81
80
|
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
82
|
-
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
83
|
-
return new Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
81
|
+
if (\u6211\u7684\u7ED3\u679C.isLeft()) return new Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
84
82
|
return b.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u6211\u7684\u7ED3\u679C.assertRight().getRight());
|
|
85
83
|
});
|
|
86
84
|
}
|
|
@@ -95,8 +93,7 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
95
93
|
\u6DF7\u5408\u7EC4\u5408(b) {
|
|
96
94
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
97
95
|
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
98
|
-
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
99
|
-
return new Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
96
|
+
if (\u6211\u7684\u7ED3\u679C.isLeft()) return new Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
100
97
|
let \u5BF9\u65B9\u7ED3\u679C = await b.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0({ ...\u53C2\u6570, ...\u6211\u7684\u7ED3\u679C.assertRight().getRight() });
|
|
101
98
|
return \u5BF9\u65B9\u7ED3\u679C.map((a) => Object.assign(a, \u6211\u7684\u7ED3\u679C.assertRight().getRight()));
|
|
102
99
|
});
|
|
@@ -105,16 +102,14 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
105
102
|
\u6620\u5C04\u7ED3\u679C(f) {
|
|
106
103
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
107
104
|
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
108
|
-
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
109
|
-
return new Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
105
|
+
if (\u6211\u7684\u7ED3\u679C.isLeft()) return new Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
110
106
|
return Either.pure(f(\u6211\u7684\u7ED3\u679C.assertRight().getRight()));
|
|
111
107
|
});
|
|
112
108
|
}
|
|
113
109
|
\u6620\u5C04\u9519\u8BEF(f) {
|
|
114
110
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
115
111
|
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
116
|
-
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
117
|
-
return new Left(f(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft()));
|
|
112
|
+
if (\u6211\u7684\u7ED3\u679C.isLeft()) return new Left(f(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft()));
|
|
118
113
|
return Either.pure(\u6211\u7684\u7ED3\u679C.assertRight().getRight());
|
|
119
114
|
});
|
|
120
115
|
}
|
|
@@ -128,8 +123,7 @@ var \u4E1A\u52A1\u884C\u4E3A = class _\u4E1A\u52A1\u884C\u4E3A {
|
|
|
128
123
|
\u7ED1\u5B9A(f) {
|
|
129
124
|
return _\u4E1A\u52A1\u884C\u4E3A.\u901A\u8FC7\u5B9E\u73B0\u6784\u9020(async (\u53C2\u6570) => {
|
|
130
125
|
let \u6211\u7684\u7ED3\u679C = await this.\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
131
|
-
if (\u6211\u7684\u7ED3\u679C.isLeft())
|
|
132
|
-
return new Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
126
|
+
if (\u6211\u7684\u7ED3\u679C.isLeft()) return new Left(\u6211\u7684\u7ED3\u679C.assertLeft().getLeft());
|
|
133
127
|
return f(\u6211\u7684\u7ED3\u679C.assertRight().getRight()).\u4E1A\u52A1\u884C\u4E3A\u5B9E\u73B0(\u53C2\u6570);
|
|
134
128
|
});
|
|
135
129
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import {
|
|
3
3
|
main
|
|
4
|
-
} from "../../chunk-
|
|
4
|
+
} from "../../chunk-UKAZDGUR.js";
|
|
5
5
|
|
|
6
6
|
// src/bin/gen-api-list/bin.ts
|
|
7
7
|
import { Command } from "commander";
|
|
8
|
-
import path from "
|
|
8
|
+
import path from "path";
|
|
9
9
|
var program = new Command();
|
|
10
10
|
program.name("\u751F\u6210\u63A5\u53E3api\u6587\u4EF6\u5217\u8868").argument("<tsconfigPath>", "tsconfig\u6587\u4EF6\u8DEF\u5F84").argument("<interfaceFolderPath>", "\u63A5\u53E3\u6587\u4EF6\u5939\u8DEF\u5F84").argument("<outFilePath>", "\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84").action(async (tsconfigPath, interfaceFolderPath, outFilePath) => {
|
|
11
11
|
let absoluteTsconfigPath = path.resolve(tsconfigPath);
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import {
|
|
3
3
|
main
|
|
4
|
-
} from "../../chunk-
|
|
4
|
+
} from "../../chunk-BHMLNO54.js";
|
|
5
5
|
|
|
6
6
|
// src/bin/gen-api-type/bin.ts
|
|
7
7
|
import { Command } from "commander";
|
|
8
|
-
import path from "
|
|
8
|
+
import path from "path";
|
|
9
9
|
var program = new Command();
|
|
10
10
|
program.name("\u751F\u6210api\u63A5\u53E3\u7C7B\u578B\u6587\u4EF6").argument("<tsconfigPath>", "tsconfig\u6587\u4EF6\u8DEF\u5F84").argument("<interfaceFolderPath>", "\u63A5\u53E3\u6587\u4EF6\u5939\u8DEF\u5F84").argument("<outFilePath>", "\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84").action(async (tsconfigPath, interfaceFolderPath, outputPath) => {
|
|
11
11
|
let absoluteTsconfigPath = path.resolve(tsconfigPath);
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import {
|
|
3
3
|
main
|
|
4
|
-
} from "../../chunk-
|
|
4
|
+
} from "../../chunk-AFWSZAXR.js";
|
|
5
5
|
|
|
6
6
|
// src/bin/gen-test/bin.ts
|
|
7
7
|
import { Command } from "commander";
|
|
8
|
-
import path from "
|
|
8
|
+
import path from "path";
|
|
9
9
|
var program = new Command();
|
|
10
10
|
program.name("\u751F\u6210\u6D4B\u8BD5\u6587\u4EF6").argument("<tsconfigPath>", "tsconfig\u6587\u4EF6\u8DEF\u5F84").argument("<interfaceFolderPath>", "\u63A5\u53E3\u6587\u4EF6\u5939\u8DEF\u5F84").argument("<outFilePath>", "\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84").argument("<filter>", "\u8FC7\u6EE4\u5668(\u6B63\u5219)").action(async (tsconfigPath, interfaceFolderPath, outFilePath, filter) => {
|
|
11
11
|
let absoluteTsconfigPath = path.resolve(tsconfigPath);
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
} from "./chunk-43GZE5YL.js";
|
|
4
4
|
|
|
5
5
|
// src/plugin/extend/chinese-path.ts
|
|
6
|
-
import { URL } from "
|
|
6
|
+
import { URL } from "url";
|
|
7
7
|
import { z } from "zod";
|
|
8
8
|
var zod\u7C7B\u578B\u8868\u793A = z.object({});
|
|
9
9
|
var \u4E2D\u6587\u8DEF\u5F84\u652F\u6301\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// src/bin/gen-test/index.ts
|
|
2
2
|
import { Log } from "@lsby/ts-log";
|
|
3
3
|
import L from "lodash";
|
|
4
|
-
import { randomUUID } from "
|
|
5
|
-
import fs from "
|
|
6
|
-
import path from "
|
|
4
|
+
import { randomUUID } from "crypto";
|
|
5
|
+
import fs from "fs";
|
|
6
|
+
import path from "path";
|
|
7
7
|
import ts from "typescript";
|
|
8
8
|
function \u68C0\u67E5\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA(\u6E90\u6587\u4EF6) {
|
|
9
9
|
for (let statement of \u6E90\u6587\u4EF6.statements) {
|
|
@@ -43,14 +43,11 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
43
43
|
let \u6240\u6709\u6E90\u6587\u4EF6 = \u9879\u76EE.getSourceFiles();
|
|
44
44
|
let \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC = \u6240\u6709\u6E90\u6587\u4EF6.filter((\u6E90\u6587\u4EF6) => {
|
|
45
45
|
let \u6E90\u6587\u4EF6\u8DEF\u5F84 = path.normalize(\u6E90\u6587\u4EF6.fileName);
|
|
46
|
-
if (\u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84) === false)
|
|
47
|
-
return false;
|
|
46
|
+
if (\u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84) === false) return false;
|
|
48
47
|
let \u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA = \u68C0\u67E5\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA(\u6E90\u6587\u4EF6);
|
|
49
|
-
if (\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA === false)
|
|
50
|
-
return false;
|
|
48
|
+
if (\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA === false) return false;
|
|
51
49
|
let \u7B26\u5408\u8FC7\u6EE4\u8868\u8FBE\u5F0F = new RegExp(\u6587\u4EF6\u8FC7\u6EE4\u8868\u8FBE\u5F0F === "" ? ".*" : \u6587\u4EF6\u8FC7\u6EE4\u8868\u8FBE\u5F0F).test(\u6E90\u6587\u4EF6\u8DEF\u5F84);
|
|
52
|
-
if (\u7B26\u5408\u8FC7\u6EE4\u8868\u8FBE\u5F0F === false)
|
|
53
|
-
return false;
|
|
50
|
+
if (\u7B26\u5408\u8FC7\u6EE4\u8868\u8FBE\u5F0F === false) return false;
|
|
54
51
|
return true;
|
|
55
52
|
});
|
|
56
53
|
await log.debug(`\u7B5B\u9009\u51FA ${\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.length} \u4E2A\u76F8\u5173\u6E90\u6587\u4EF6`);
|
|
@@ -74,8 +71,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
74
71
|
...\u9879\u76EE\u4E3B\u673A,
|
|
75
72
|
getSourceFile: (filename) => {
|
|
76
73
|
let \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 = \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC.find((a) => a.fileName === filename) ?? null;
|
|
77
|
-
if (\u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 !== null)
|
|
78
|
-
return \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6;
|
|
74
|
+
if (\u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 !== null) return \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6;
|
|
79
75
|
return \u9879\u76EE.getSourceFile(filename);
|
|
80
76
|
}
|
|
81
77
|
},
|
|
@@ -89,8 +85,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
89
85
|
if (ts.isTypeAliasDeclaration(node) && node.name.text === "\u8BA1\u7B97\u7ED3\u679C") {
|
|
90
86
|
let type = \u7C7B\u578B\u68C0\u67E5\u5668.getTypeAtLocation(node);
|
|
91
87
|
let \u6587\u672C\u7ED3\u679C = \u7C7B\u578B\u68C0\u67E5\u5668.typeToString(type);
|
|
92
|
-
if (\u6587\u672C\u7ED3\u679C === "true")
|
|
93
|
-
\u7ED3\u679C = true;
|
|
88
|
+
if (\u6587\u672C\u7ED3\u679C === "true") \u7ED3\u679C = true;
|
|
94
89
|
}
|
|
95
90
|
});
|
|
96
91
|
\u68C0\u67E5\u7ED3\u679C.push(\u7ED3\u679C);
|
|
@@ -109,8 +104,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
109
104
|
];
|
|
110
105
|
await log.debug("\u6700\u7EC8\u4EE3\u7801\u751F\u6210\u5B8C\u6210");
|
|
111
106
|
let \u8F93\u51FA\u6587\u4EF6\u5939 = path.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84);
|
|
112
|
-
if (fs.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939) === false)
|
|
113
|
-
fs.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });
|
|
107
|
+
if (fs.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939) === false) fs.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });
|
|
114
108
|
fs.writeFileSync(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, \u6700\u7EC8\u4EE3\u7801.join("\n"));
|
|
115
109
|
await log.debug(`\u8F93\u51FA\u6587\u4EF6\u5199\u5165\u5B8C\u6210: ${\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84}`);
|
|
116
110
|
}
|
|
@@ -3,10 +3,10 @@ import {
|
|
|
3
3
|
} from "./chunk-43GZE5YL.js";
|
|
4
4
|
import {
|
|
5
5
|
递归截断字符串
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-ZIVQ3WZA.js";
|
|
7
7
|
|
|
8
8
|
// src/plugin/extend/query.ts
|
|
9
|
-
import { format } from "
|
|
9
|
+
import { format } from "util";
|
|
10
10
|
var \u70D9\u5370 = Symbol();
|
|
11
11
|
var GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
12
12
|
[\u70D9\u5370] = ["GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6"];
|
|
@@ -1,17 +1,12 @@
|
|
|
1
1
|
// src/global/global.ts
|
|
2
2
|
import { GlobalItem, GlobalService } from "@lsby/ts-global";
|
|
3
3
|
import { Log } from "@lsby/ts-log";
|
|
4
|
-
var
|
|
5
|
-
new GlobalItem("log", new Log("@lsby:net-core")),
|
|
6
|
-
new GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
7
|
-
]);
|
|
8
|
-
|
|
9
|
-
// src/global/web-socket-management.ts
|
|
4
|
+
var log = new Log("@lsby:net-core");
|
|
10
5
|
var WebSocket\u7BA1\u7406\u5668 = class {
|
|
11
6
|
constructor(\u8FDE\u63A5\u8868) {
|
|
12
7
|
this.\u8FDE\u63A5\u8868 = \u8FDE\u63A5\u8868;
|
|
13
8
|
}
|
|
14
|
-
log =
|
|
9
|
+
log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
15
10
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
16
11
|
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
17
12
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
@@ -20,8 +15,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
20
15
|
return this.\u8FDE\u63A5\u8868.hasOwnProperty(id) ? true : false;
|
|
21
16
|
}
|
|
22
17
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(id, \u6E05\u7406\u51FD\u6570) {
|
|
23
|
-
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false)
|
|
24
|
-
return;
|
|
18
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
25
19
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
26
20
|
}
|
|
27
21
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
@@ -39,6 +33,10 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
39
33
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
40
34
|
}
|
|
41
35
|
};
|
|
36
|
+
var Global = new GlobalService([
|
|
37
|
+
new GlobalItem("log", log),
|
|
38
|
+
new GlobalItem("WebSocket\u7BA1\u7406\u5668", new WebSocket\u7BA1\u7406\u5668({}))
|
|
39
|
+
]);
|
|
42
40
|
|
|
43
41
|
export {
|
|
44
42
|
WebSocket管理器,
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// src/bin/gen-api-type/index.ts
|
|
2
2
|
import { Log } from "@lsby/ts-log";
|
|
3
|
-
import { randomUUID } from "
|
|
4
|
-
import fs from "
|
|
5
|
-
import path from "
|
|
3
|
+
import { randomUUID } from "crypto";
|
|
4
|
+
import fs from "fs";
|
|
5
|
+
import path from "path";
|
|
6
6
|
import ts from "typescript";
|
|
7
7
|
function \u68C0\u67E5\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA(\u6E90\u6587\u4EF6) {
|
|
8
8
|
for (let statement of \u6E90\u6587\u4EF6.statements) {
|
|
@@ -32,11 +32,9 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
32
32
|
let \u6240\u6709\u6E90\u6587\u4EF6 = \u9879\u76EE.getSourceFiles();
|
|
33
33
|
let \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC = \u6240\u6709\u6E90\u6587\u4EF6.filter((\u6E90\u6587\u4EF6) => {
|
|
34
34
|
let \u6E90\u6587\u4EF6\u8DEF\u5F84 = path.normalize(\u6E90\u6587\u4EF6.fileName);
|
|
35
|
-
if (\u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84) === false)
|
|
36
|
-
return false;
|
|
35
|
+
if (\u6E90\u6587\u4EF6\u8DEF\u5F84.includes(\u76EE\u6807\u8DEF\u5F84) === false) return false;
|
|
37
36
|
let \u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA = \u68C0\u67E5\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA(\u6E90\u6587\u4EF6);
|
|
38
|
-
if (\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA === false)
|
|
39
|
-
return false;
|
|
37
|
+
if (\u5B58\u5728\u9ED8\u8BA4\u5BFC\u51FA === false) return false;
|
|
40
38
|
return true;
|
|
41
39
|
});
|
|
42
40
|
await log.debug(`\u7B5B\u9009\u51FA ${\u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.length} \u4E2A\u76F8\u5173\u6E90\u6587\u4EF6`);
|
|
@@ -97,8 +95,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
97
95
|
...\u9879\u76EE\u4E3B\u673A,
|
|
98
96
|
getSourceFile: (filename) => {
|
|
99
97
|
let \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 = \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC.find((a) => a.fileName === filename) ?? null;
|
|
100
|
-
if (\u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 !== null)
|
|
101
|
-
return \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6;
|
|
98
|
+
if (\u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6 !== null) return \u627E\u5230\u7684\u865A\u62DF\u6587\u4EF6;
|
|
102
99
|
return \u9879\u76EE.getSourceFile(filename);
|
|
103
100
|
}
|
|
104
101
|
},
|
|
@@ -179,8 +176,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
179
176
|
];
|
|
180
177
|
await log.debug("\u6700\u7EC8\u4EE3\u7801\u751F\u6210\u5B8C\u6210");
|
|
181
178
|
let \u8F93\u51FA\u6587\u4EF6\u5939 = path.dirname(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84);
|
|
182
|
-
if (fs.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939) === false)
|
|
183
|
-
fs.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });
|
|
179
|
+
if (fs.existsSync(\u8F93\u51FA\u6587\u4EF6\u5939) === false) fs.mkdirSync(\u8F93\u51FA\u6587\u4EF6\u5939, { recursive: true });
|
|
184
180
|
fs.writeFileSync(\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84, \u6700\u7EC8\u4EE3\u7801.join("\n"));
|
|
185
181
|
await log.debug(`\u8F93\u51FA\u6587\u4EF6\u5199\u5165\u5B8C\u6210: ${\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84}`);
|
|
186
182
|
}
|
|
@@ -3,11 +3,11 @@ import {
|
|
|
3
3
|
} from "./chunk-43GZE5YL.js";
|
|
4
4
|
import {
|
|
5
5
|
递归截断字符串
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-ZIVQ3WZA.js";
|
|
7
7
|
|
|
8
8
|
// src/plugin/extend/json.ts
|
|
9
9
|
import express from "express";
|
|
10
|
-
import { format } from "
|
|
10
|
+
import { format } from "util";
|
|
11
11
|
var \u70D9\u5370 = Symbol();
|
|
12
12
|
var JSON\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
13
13
|
[\u70D9\u5370] = ["JSON\u89E3\u6790\u63D2\u4EF6"];
|
|
@@ -44,8 +44,7 @@ var \u63A5\u53E3\u903B\u8F91Base = class _\u63A5\u53E3\u903B\u8F91Base {
|
|
|
44
44
|
[...this.\u83B7\u5F97\u63D2\u4EF6\u4EEC(), ...\u8F93\u5165.\u83B7\u5F97\u63D2\u4EF6\u4EEC()],
|
|
45
45
|
async (\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570) => {
|
|
46
46
|
let \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C = await this.\u5B9E\u73B0(\u53C2\u6570, \u903B\u8F91\u9644\u52A0\u53C2\u6570, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
47
|
-
if (\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.isLeft())
|
|
48
|
-
return \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C;
|
|
47
|
+
if (\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.isLeft()) return \u4E0A\u5C42\u8C03\u7528\u7ED3\u679C;
|
|
49
48
|
let \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684 = { ...\u903B\u8F91\u9644\u52A0\u53C2\u6570, ...\u4E0A\u5C42\u8C03\u7528\u7ED3\u679C.assertRight().getRight() };
|
|
50
49
|
let \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C = await \u8F93\u5165.\u5B9E\u73B0(\u53C2\u6570, \u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, \u8BF7\u6C42\u9644\u52A0\u53C2\u6570);
|
|
51
50
|
let \u6700\u7EC8\u8FD4\u56DE\u7ED3\u679C = \u4E0B\u5C42\u8C03\u7528\u7ED3\u679C.map((a) => ({ ...\u4F20\u7ED9\u4E0B\u4E00\u5C42\u7684, ...a }));
|