@lsby/net-core 0.10.3 → 0.12.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-type/bin.cjs +17 -12
- package/dist/bin/gen-api-type/index.cjs +17 -12
- package/dist/cjs/bin/gen-api-type/bin.cjs +17 -12
- package/dist/cjs/bin/gen-api-type/index.cjs +17 -12
- package/dist/cjs/global/global.cjs +16 -0
- package/dist/cjs/global/global.d.cts +2 -0
- package/dist/cjs/index.cjs +90 -62
- package/dist/cjs/index.d.cts +4 -4
- package/dist/cjs/interface/interface-base.d.cts +1 -1
- package/dist/cjs/interface/interface-logic.d.cts +1 -1
- package/dist/cjs/interface/interface-result.cjs +0 -6
- package/dist/cjs/interface/interface-result.d.cts +1 -1
- package/dist/cjs/{interface-base-CyfrfgWu.d.cts → interface-base-gRngpxki.d.cts} +6 -5
- package/dist/cjs/plugin/extend/custom-data.d.cts +1 -1
- package/dist/cjs/plugin/extend/json.cjs +5 -5
- package/dist/cjs/plugin/extend/json.d.cts +4 -4
- package/dist/cjs/plugin/extend/log-headers.d.cts +1 -1
- package/dist/cjs/plugin/extend/query.d.cts +1 -1
- package/dist/cjs/plugin/extend/urlencoded.cjs +4 -4
- package/dist/cjs/plugin/extend/urlencoded.d.cts +3 -3
- package/dist/cjs/plugin/extend/web-socket.cjs +33 -2
- package/dist/cjs/plugin/extend/web-socket.d.cts +10 -8
- package/dist/cjs/plugin/plug.d.cts +1 -1
- package/dist/cjs/server/server.cjs +64 -45
- package/dist/cjs/server/server.d.cts +1 -1
- package/dist/cjs/wrapper/common-wrapper-return.cjs +0 -3
- package/dist/cjs/wrapper/common-wrapper-return.d.cts +1 -1
- package/dist/cjs/wrapper/common-wrapper.cjs +0 -3
- package/dist/cjs/wrapper/common-wrapper.d.cts +1 -1
- package/dist/cjs/wrapper/deferred-result-wrapper.cjs +0 -3
- package/dist/cjs/wrapper/deferred-result-wrapper.d.cts +1 -1
- package/dist/cjs/wrapper/express-compatible-wrapper.d.cts +1 -1
- package/dist/cjs/wrapper/file-download-wrapper.cjs +0 -3
- package/dist/cjs/wrapper/file-download-wrapper.d.cts +1 -1
- package/dist/esm/bin/gen-api-type/bin.js +1 -1
- package/dist/esm/bin/gen-api-type/index.js +1 -1
- package/dist/esm/{chunk-B5DKJ5AV.js → chunk-2FCXR6G7.js} +17 -12
- package/dist/esm/{chunk-3ZQFVYIR.js → chunk-2NYRVBAS.js} +49 -46
- package/dist/esm/{chunk-NJKBRPN7.js → chunk-3YGTOEO2.js} +16 -0
- package/dist/esm/{chunk-H7LZCHCE.js → chunk-6RQPNF75.js} +1 -1
- package/dist/esm/{chunk-HDPEZW7H.js → chunk-FYEIC5J3.js} +1 -1
- package/dist/esm/{chunk-C5FED6EO.js → chunk-GC5W4SQN.js} +18 -3
- package/dist/esm/{chunk-NB2QNDI2.js → chunk-GKABWQWT.js} +1 -1
- package/dist/esm/{chunk-XSYZ5A6R.js → chunk-IM3E5KN4.js} +1 -1
- package/dist/esm/{chunk-TSDOOGHG.js → chunk-KENYGKWI.js} +4 -4
- package/dist/esm/{chunk-DNJQGD5M.js → chunk-P75EGBKC.js} +0 -6
- package/dist/esm/{chunk-NCYHKHIH.js → chunk-SGOVPJHV.js} +1 -1
- package/dist/esm/{chunk-3XRAG6DM.js → chunk-VRF5WLKI.js} +3 -3
- package/dist/esm/global/global.d.ts +2 -0
- package/dist/esm/global/global.js +1 -1
- package/dist/esm/index.d.ts +4 -4
- package/dist/esm/index.js +17 -17
- package/dist/esm/interface/interface-base.d.ts +1 -1
- package/dist/esm/interface/interface-logic.d.ts +1 -1
- package/dist/esm/interface/interface-result.d.ts +1 -1
- package/dist/esm/interface/interface-result.js +1 -1
- package/dist/esm/{interface-base-C1ZNSMJz.d.ts → interface-base-DDfmN_Dg.d.ts} +6 -5
- package/dist/esm/plugin/extend/custom-data.d.ts +1 -1
- package/dist/esm/plugin/extend/json.d.ts +4 -4
- package/dist/esm/plugin/extend/json.js +3 -3
- package/dist/esm/plugin/extend/log-headers.d.ts +1 -1
- package/dist/esm/plugin/extend/query.d.ts +1 -1
- package/dist/esm/plugin/extend/urlencoded.d.ts +3 -3
- package/dist/esm/plugin/extend/urlencoded.js +3 -3
- package/dist/esm/plugin/extend/web-socket.d.ts +10 -8
- package/dist/esm/plugin/extend/web-socket.js +2 -2
- package/dist/esm/plugin/plug.d.ts +1 -1
- package/dist/esm/server/server.d.ts +1 -1
- package/dist/esm/server/server.js +2 -2
- package/dist/esm/wrapper/common-wrapper-return.d.ts +1 -1
- package/dist/esm/wrapper/common-wrapper-return.js +2 -2
- package/dist/esm/wrapper/common-wrapper.d.ts +1 -1
- package/dist/esm/wrapper/common-wrapper.js +2 -2
- package/dist/esm/wrapper/deferred-result-wrapper.d.ts +1 -1
- package/dist/esm/wrapper/deferred-result-wrapper.js +2 -2
- package/dist/esm/wrapper/express-compatible-wrapper.d.ts +1 -1
- package/dist/esm/wrapper/express-compatible-wrapper.js +2 -2
- package/dist/esm/wrapper/file-download-wrapper.d.ts +1 -1
- package/dist/esm/wrapper/file-download-wrapper.js +2 -2
- package/package.json +3 -3
|
@@ -70,7 +70,8 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
70
70
|
let \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC = \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.map((a) => {
|
|
71
71
|
let \u4EE3\u7801 = `
|
|
72
72
|
import {
|
|
73
|
-
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\
|
|
73
|
+
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u51FA,
|
|
74
|
+
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u5165,
|
|
74
75
|
\u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C,
|
|
75
76
|
\u5408\u5E76GET\u63D2\u4EF6\u7ED3\u679C,
|
|
76
77
|
\u83B7\u5F97\u63A5\u53E3\u65B9\u6CD5\u7C7B\u578B,
|
|
@@ -90,7 +91,8 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
90
91
|
type jsonInput = \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
91
92
|
type jsonErrorOutput = \u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0F<typeof \u5BFC\u5165>
|
|
92
93
|
type jsonSuccessOutput = \u83B7\u5F97\u63A5\u53E3\u6B63\u786E\u5F62\u5F0F<typeof \u5BFC\u5165>
|
|
93
|
-
type
|
|
94
|
+
type wsInput = \u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u5165<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
95
|
+
type wsOutput = \u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u51FA<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
94
96
|
type JSON\u63A5\u53E3\u8BA1\u7B97\u7ED3\u679C = jsonPath extends never
|
|
95
97
|
? never
|
|
96
98
|
: jsonPath extends infer _
|
|
@@ -99,15 +101,18 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
99
101
|
? jsonInput extends infer _
|
|
100
102
|
? jsonErrorOutput extends infer _
|
|
101
103
|
? jsonSuccessOutput extends infer _
|
|
102
|
-
?
|
|
103
|
-
?
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
104
|
+
? wsOutput extends infer _
|
|
105
|
+
? wsInput extends infer _
|
|
106
|
+
? {
|
|
107
|
+
path: jsonPath
|
|
108
|
+
method: jsonMethod
|
|
109
|
+
input: jsonMethod extends 'post' ? jsonInput['body'] : jsonMethod extends 'get' ? getInput['query'] : {}
|
|
110
|
+
errorOutput: jsonErrorOutput
|
|
111
|
+
successOutput: jsonSuccessOutput
|
|
112
|
+
wsOutput: wsOutput
|
|
113
|
+
wsInput: wsInput
|
|
114
|
+
}
|
|
115
|
+
: never
|
|
111
116
|
: never
|
|
112
117
|
: never
|
|
113
118
|
: never
|
|
@@ -193,7 +198,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
193
198
|
case "aliasSymbol":
|
|
194
199
|
\u5BFC\u51FA\u7C7B\u578B.push(`${\u5BFC\u51FA\u7C7B\u578B\u5B9A\u4E49}`);
|
|
195
200
|
break;
|
|
196
|
-
|
|
201
|
+
case null:
|
|
197
202
|
break;
|
|
198
203
|
}
|
|
199
204
|
}
|
|
@@ -75,7 +75,8 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
75
75
|
let \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC = \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.map((a) => {
|
|
76
76
|
let \u4EE3\u7801 = `
|
|
77
77
|
import {
|
|
78
|
-
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\
|
|
78
|
+
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u51FA,
|
|
79
|
+
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u5165,
|
|
79
80
|
\u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C,
|
|
80
81
|
\u5408\u5E76GET\u63D2\u4EF6\u7ED3\u679C,
|
|
81
82
|
\u83B7\u5F97\u63A5\u53E3\u65B9\u6CD5\u7C7B\u578B,
|
|
@@ -95,7 +96,8 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
95
96
|
type jsonInput = \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
96
97
|
type jsonErrorOutput = \u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0F<typeof \u5BFC\u5165>
|
|
97
98
|
type jsonSuccessOutput = \u83B7\u5F97\u63A5\u53E3\u6B63\u786E\u5F62\u5F0F<typeof \u5BFC\u5165>
|
|
98
|
-
type
|
|
99
|
+
type wsInput = \u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u5165<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
100
|
+
type wsOutput = \u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u51FA<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
99
101
|
type JSON\u63A5\u53E3\u8BA1\u7B97\u7ED3\u679C = jsonPath extends never
|
|
100
102
|
? never
|
|
101
103
|
: jsonPath extends infer _
|
|
@@ -104,15 +106,18 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
104
106
|
? jsonInput extends infer _
|
|
105
107
|
? jsonErrorOutput extends infer _
|
|
106
108
|
? jsonSuccessOutput extends infer _
|
|
107
|
-
?
|
|
108
|
-
?
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
109
|
+
? wsOutput extends infer _
|
|
110
|
+
? wsInput extends infer _
|
|
111
|
+
? {
|
|
112
|
+
path: jsonPath
|
|
113
|
+
method: jsonMethod
|
|
114
|
+
input: jsonMethod extends 'post' ? jsonInput['body'] : jsonMethod extends 'get' ? getInput['query'] : {}
|
|
115
|
+
errorOutput: jsonErrorOutput
|
|
116
|
+
successOutput: jsonSuccessOutput
|
|
117
|
+
wsOutput: wsOutput
|
|
118
|
+
wsInput: wsInput
|
|
119
|
+
}
|
|
120
|
+
: never
|
|
116
121
|
: never
|
|
117
122
|
: never
|
|
118
123
|
: never
|
|
@@ -198,7 +203,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
198
203
|
case "aliasSymbol":
|
|
199
204
|
\u5BFC\u51FA\u7C7B\u578B.push(`${\u5BFC\u51FA\u7C7B\u578B\u5B9A\u4E49}`);
|
|
200
205
|
break;
|
|
201
|
-
|
|
206
|
+
case null:
|
|
202
207
|
break;
|
|
203
208
|
}
|
|
204
209
|
}
|
|
@@ -70,7 +70,8 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
70
70
|
let \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC = \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.map((a) => {
|
|
71
71
|
let \u4EE3\u7801 = `
|
|
72
72
|
import {
|
|
73
|
-
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\
|
|
73
|
+
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u51FA,
|
|
74
|
+
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u5165,
|
|
74
75
|
\u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C,
|
|
75
76
|
\u5408\u5E76GET\u63D2\u4EF6\u7ED3\u679C,
|
|
76
77
|
\u83B7\u5F97\u63A5\u53E3\u65B9\u6CD5\u7C7B\u578B,
|
|
@@ -90,7 +91,8 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
90
91
|
type jsonInput = \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
91
92
|
type jsonErrorOutput = \u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0F<typeof \u5BFC\u5165>
|
|
92
93
|
type jsonSuccessOutput = \u83B7\u5F97\u63A5\u53E3\u6B63\u786E\u5F62\u5F0F<typeof \u5BFC\u5165>
|
|
93
|
-
type
|
|
94
|
+
type wsInput = \u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u5165<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
95
|
+
type wsOutput = \u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u51FA<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
94
96
|
type JSON\u63A5\u53E3\u8BA1\u7B97\u7ED3\u679C = jsonPath extends never
|
|
95
97
|
? never
|
|
96
98
|
: jsonPath extends infer _
|
|
@@ -99,15 +101,18 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
99
101
|
? jsonInput extends infer _
|
|
100
102
|
? jsonErrorOutput extends infer _
|
|
101
103
|
? jsonSuccessOutput extends infer _
|
|
102
|
-
?
|
|
103
|
-
?
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
104
|
+
? wsOutput extends infer _
|
|
105
|
+
? wsInput extends infer _
|
|
106
|
+
? {
|
|
107
|
+
path: jsonPath
|
|
108
|
+
method: jsonMethod
|
|
109
|
+
input: jsonMethod extends 'post' ? jsonInput['body'] : jsonMethod extends 'get' ? getInput['query'] : {}
|
|
110
|
+
errorOutput: jsonErrorOutput
|
|
111
|
+
successOutput: jsonSuccessOutput
|
|
112
|
+
wsOutput: wsOutput
|
|
113
|
+
wsInput: wsInput
|
|
114
|
+
}
|
|
115
|
+
: never
|
|
111
116
|
: never
|
|
112
117
|
: never
|
|
113
118
|
: never
|
|
@@ -193,7 +198,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
193
198
|
case "aliasSymbol":
|
|
194
199
|
\u5BFC\u51FA\u7C7B\u578B.push(`${\u5BFC\u51FA\u7C7B\u578B\u5B9A\u4E49}`);
|
|
195
200
|
break;
|
|
196
|
-
|
|
201
|
+
case null:
|
|
197
202
|
break;
|
|
198
203
|
}
|
|
199
204
|
}
|
|
@@ -75,7 +75,8 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
75
75
|
let \u4F34\u968F\u7684\u865A\u62DF\u6587\u4EF6\u4EEC = \u76F8\u5173\u6E90\u6587\u4EF6\u4EEC.map((a) => {
|
|
76
76
|
let \u4EE3\u7801 = `
|
|
77
77
|
import {
|
|
78
|
-
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\
|
|
78
|
+
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u51FA,
|
|
79
|
+
\u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u5165,
|
|
79
80
|
\u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C,
|
|
80
81
|
\u5408\u5E76GET\u63D2\u4EF6\u7ED3\u679C,
|
|
81
82
|
\u83B7\u5F97\u63A5\u53E3\u65B9\u6CD5\u7C7B\u578B,
|
|
@@ -95,7 +96,8 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
95
96
|
type jsonInput = \u5408\u5E76JSON\u63D2\u4EF6\u7ED3\u679C<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
96
97
|
type jsonErrorOutput = \u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0F<typeof \u5BFC\u5165>
|
|
97
98
|
type jsonSuccessOutput = \u83B7\u5F97\u63A5\u53E3\u6B63\u786E\u5F62\u5F0F<typeof \u5BFC\u5165>
|
|
98
|
-
type
|
|
99
|
+
type wsInput = \u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u5165<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
100
|
+
type wsOutput = \u53D6\u7B2C\u4E00\u4E2AWS\u63D2\u4EF6\u8F93\u51FA<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u63D2\u4EF6\u7C7B\u578B<\u83B7\u5F97\u63A5\u53E3\u903B\u8F91\u7C7B\u578B<typeof \u5BFC\u5165>>>
|
|
99
101
|
type JSON\u63A5\u53E3\u8BA1\u7B97\u7ED3\u679C = jsonPath extends never
|
|
100
102
|
? never
|
|
101
103
|
: jsonPath extends infer _
|
|
@@ -104,15 +106,18 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
104
106
|
? jsonInput extends infer _
|
|
105
107
|
? jsonErrorOutput extends infer _
|
|
106
108
|
? jsonSuccessOutput extends infer _
|
|
107
|
-
?
|
|
108
|
-
?
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
109
|
+
? wsOutput extends infer _
|
|
110
|
+
? wsInput extends infer _
|
|
111
|
+
? {
|
|
112
|
+
path: jsonPath
|
|
113
|
+
method: jsonMethod
|
|
114
|
+
input: jsonMethod extends 'post' ? jsonInput['body'] : jsonMethod extends 'get' ? getInput['query'] : {}
|
|
115
|
+
errorOutput: jsonErrorOutput
|
|
116
|
+
successOutput: jsonSuccessOutput
|
|
117
|
+
wsOutput: wsOutput
|
|
118
|
+
wsInput: wsInput
|
|
119
|
+
}
|
|
120
|
+
: never
|
|
116
121
|
: never
|
|
117
122
|
: never
|
|
118
123
|
: never
|
|
@@ -198,7 +203,7 @@ async function main(tsconfig\u8DEF\u5F84, \u76EE\u6807\u8DEF\u5F84, \u8F93\u51FA
|
|
|
198
203
|
case "aliasSymbol":
|
|
199
204
|
\u5BFC\u51FA\u7C7B\u578B.push(`${\u5BFC\u51FA\u7C7B\u578B\u5B9A\u4E49}`);
|
|
200
205
|
break;
|
|
201
|
-
|
|
206
|
+
case null:
|
|
202
207
|
break;
|
|
203
208
|
}
|
|
204
209
|
}
|
|
@@ -42,6 +42,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
42
42
|
}
|
|
43
43
|
log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
44
44
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
45
|
+
\u6D88\u606F\u76D1\u542C\u8868 = {};
|
|
45
46
|
\u5B9A\u65F6\u5668ID = null;
|
|
46
47
|
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
47
48
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
@@ -53,6 +54,20 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
53
54
|
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
54
55
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
55
56
|
}
|
|
57
|
+
async \u8BBE\u7F6E\u6D88\u606F\u76D1\u542C(id, \u56DE\u8C03\u51FD\u6570) {
|
|
58
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
59
|
+
this.\u6D88\u606F\u76D1\u542C\u8868[id] = \u56DE\u8C03\u51FD\u6570;
|
|
60
|
+
let ws\u53E5\u67C4 = this.\u8FDE\u63A5\u8868[id];
|
|
61
|
+
if (ws\u53E5\u67C4 !== null && ws\u53E5\u67C4 !== void 0) {
|
|
62
|
+
ws\u53E5\u67C4.onmessage = async (event) => {
|
|
63
|
+
try {
|
|
64
|
+
await \u56DE\u8C03\u51FD\u6570(JSON.parse(event.data.toString()));
|
|
65
|
+
} catch (err) {
|
|
66
|
+
await this.log.warn(`WebSocket \u6D88\u606F\u5904\u7406\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
}
|
|
56
71
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
57
72
|
return this.\u8FDE\u63A5\u8868[id] ?? null;
|
|
58
73
|
}
|
|
@@ -66,6 +81,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
66
81
|
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
67
82
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
68
83
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
84
|
+
delete this.\u6D88\u606F\u76D1\u542C\u8868[id];
|
|
69
85
|
}
|
|
70
86
|
async \u6E05\u7406\u65E0\u6548\u8FDE\u63A5() {
|
|
71
87
|
let \u6E05\u7406\u6570\u91CF = 0;
|
|
@@ -7,11 +7,13 @@ declare class WebSocket管理器 {
|
|
|
7
7
|
private 连接表;
|
|
8
8
|
private log;
|
|
9
9
|
private 清理函数表;
|
|
10
|
+
private 消息监听表;
|
|
10
11
|
private 定时器ID;
|
|
11
12
|
constructor(连接表: Record<id, WebSocket | null>);
|
|
12
13
|
增加连接(id: id, ws句柄: WebSocket): void;
|
|
13
14
|
查询连接存在(id: string): boolean;
|
|
14
15
|
设置清理函数(id: string, 清理函数: () => Promise<void>): Promise<void>;
|
|
16
|
+
设置消息监听(id: string, 回调函数: (数据: any) => Promise<void>): Promise<void>;
|
|
15
17
|
获得句柄(id: id): Promise<WebSocket | null>;
|
|
16
18
|
删除连接(id: string): void;
|
|
17
19
|
private 清理无效连接;
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -33,7 +33,7 @@ __export(index_exports, {
|
|
|
33
33
|
EXPORT_TYPE: () => EXPORT_TYPE,
|
|
34
34
|
Express\u517C\u5BB9\u63A5\u53E3\u5C01\u88C5: () => Express\u517C\u5BB9\u63A5\u53E3\u5C01\u88C5,
|
|
35
35
|
GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6: () => GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
|
|
36
|
-
JSON\u89E3\u6790\u63D2\u4EF6: () => JSON\u89E3\u6790\u63D2\u4EF6,
|
|
36
|
+
JSON\u53C2\u6570\u89E3\u6790\u63D2\u4EF6: () => JSON\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
|
|
37
37
|
WebSocket\u63D2\u4EF6: () => WebSocket\u63D2\u4EF6,
|
|
38
38
|
\u5E38\u7528\u5F62\u5F0F\u5E76\u81EA\u5B9A\u4E49\u8FD4\u56DE\u5668\u63A5\u53E3\u5C01\u88C5: () => \u5E38\u7528\u5F62\u5F0F\u5E76\u81EA\u5B9A\u4E49\u8FD4\u56DE\u5668\u63A5\u53E3\u5C01\u88C5,
|
|
39
39
|
\u5E38\u7528\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5: () => \u5E38\u7528\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5,
|
|
@@ -55,7 +55,7 @@ __export(index_exports, {
|
|
|
55
55
|
\u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668: () => \u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668,
|
|
56
56
|
\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6: () => \u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6,
|
|
57
57
|
\u81EA\u5B9A\u4E49\u8FD4\u56DE\u5668: () => \u81EA\u5B9A\u4E49\u8FD4\u56DE\u5668,
|
|
58
|
-
\u8868\u5355\u89E3\u6790\u63D2\u4EF6: () => \u8868\u5355\u89E3\u6790\u63D2\u4EF6,
|
|
58
|
+
\u8868\u5355\u53C2\u6570\u89E3\u6790\u63D2\u4EF6: () => \u8868\u5355\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
|
|
59
59
|
\u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6: () => \u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6
|
|
60
60
|
});
|
|
61
61
|
module.exports = __toCommonJS(index_exports);
|
|
@@ -234,9 +234,6 @@ var \u5E38\u7528\u5F62\u5F0F\u8F6C\u6362\u5668 = class extends \u63A5\u53E3\u7ED
|
|
|
234
234
|
case "Right": {
|
|
235
235
|
return { status: "success", data: \u6570\u636E.assertRight().getRight() };
|
|
236
236
|
}
|
|
237
|
-
default: {
|
|
238
|
-
throw new Error("\u610F\u5916\u7684\u6570\u636E\u6807\u8BB0");
|
|
239
|
-
}
|
|
240
237
|
}
|
|
241
238
|
}
|
|
242
239
|
};
|
|
@@ -249,9 +246,6 @@ var \u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668 = class extends \u63A5\u53E3\u7ED
|
|
|
249
246
|
case "Right": {
|
|
250
247
|
return \u6570\u636E.assertRight().getRight().data;
|
|
251
248
|
}
|
|
252
|
-
default: {
|
|
253
|
-
throw new Error("\u610F\u5916\u7684\u6570\u636E\u6807\u8BB0");
|
|
254
|
-
}
|
|
255
249
|
}
|
|
256
250
|
}
|
|
257
251
|
};
|
|
@@ -339,11 +333,11 @@ function \u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6570\u636E) {
|
|
|
339
333
|
|
|
340
334
|
// src/plugin/extend/json.ts
|
|
341
335
|
var \u70D9\u5370 = Symbol();
|
|
342
|
-
var JSON\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
343
|
-
[\u70D9\u5370] = ["JSON\u89E3\u6790\u63D2\u4EF6"];
|
|
336
|
+
var JSON\u53C2\u6570\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
337
|
+
[\u70D9\u5370] = ["JSON\u53C2\u6570\u89E3\u6790\u63D2\u4EF6"];
|
|
344
338
|
constructor(t, opt) {
|
|
345
339
|
super(import_zod.z.object({ body: t }), async (req, res, \u9644\u52A0\u53C2\u6570) => {
|
|
346
|
-
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("JSON\u89E3\u6790\u63D2\u4EF6");
|
|
340
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("JSON\u53C2\u6570\u89E3\u6790\u63D2\u4EF6");
|
|
347
341
|
await new Promise(
|
|
348
342
|
(pRes, _rej) => import_express.default.json(opt)(req, res, () => {
|
|
349
343
|
pRes(null);
|
|
@@ -399,10 +393,10 @@ var GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
399
393
|
var import_express2 = __toESM(require("express"), 1);
|
|
400
394
|
var import_node_util3 = require("util");
|
|
401
395
|
var import_zod4 = require("zod");
|
|
402
|
-
var \u8868\u5355\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
396
|
+
var \u8868\u5355\u53C2\u6570\u89E3\u6790\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
403
397
|
constructor(t, opt) {
|
|
404
398
|
super(import_zod4.z.object({ form: t }), async (req, res, \u9644\u52A0\u53C2\u6570) => {
|
|
405
|
-
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("\u8868\u5355\u89E3\u6790\u63D2\u4EF6");
|
|
399
|
+
let log2 = \u9644\u52A0\u53C2\u6570.log.extend("\u8868\u5355\u53C2\u6570\u89E3\u6790\u63D2\u4EF6");
|
|
406
400
|
await new Promise(
|
|
407
401
|
(pRes, _rej) => import_express2.default.urlencoded({ extended: true, ...opt })(req, res, () => {
|
|
408
402
|
pRes(null);
|
|
@@ -441,6 +435,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
441
435
|
}
|
|
442
436
|
log = log.extend("@lsby:net-core").extend("WebSocket\u7BA1\u7406\u5668");
|
|
443
437
|
\u6E05\u7406\u51FD\u6570\u8868 = {};
|
|
438
|
+
\u6D88\u606F\u76D1\u542C\u8868 = {};
|
|
444
439
|
\u5B9A\u65F6\u5668ID = null;
|
|
445
440
|
\u589E\u52A0\u8FDE\u63A5(id, ws\u53E5\u67C4) {
|
|
446
441
|
this.\u8FDE\u63A5\u8868[id] = ws\u53E5\u67C4;
|
|
@@ -452,6 +447,20 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
452
447
|
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
453
448
|
this.\u6E05\u7406\u51FD\u6570\u8868[id] = \u6E05\u7406\u51FD\u6570;
|
|
454
449
|
}
|
|
450
|
+
async \u8BBE\u7F6E\u6D88\u606F\u76D1\u542C(id, \u56DE\u8C03\u51FD\u6570) {
|
|
451
|
+
if (this.\u8FDE\u63A5\u8868.hasOwnProperty(id) === false) return;
|
|
452
|
+
this.\u6D88\u606F\u76D1\u542C\u8868[id] = \u56DE\u8C03\u51FD\u6570;
|
|
453
|
+
let ws\u53E5\u67C4 = this.\u8FDE\u63A5\u8868[id];
|
|
454
|
+
if (ws\u53E5\u67C4 !== null && ws\u53E5\u67C4 !== void 0) {
|
|
455
|
+
ws\u53E5\u67C4.onmessage = async (event) => {
|
|
456
|
+
try {
|
|
457
|
+
await \u56DE\u8C03\u51FD\u6570(JSON.parse(event.data.toString()));
|
|
458
|
+
} catch (err) {
|
|
459
|
+
await this.log.warn(`WebSocket \u6D88\u606F\u5904\u7406\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`);
|
|
460
|
+
}
|
|
461
|
+
};
|
|
462
|
+
}
|
|
463
|
+
}
|
|
455
464
|
async \u83B7\u5F97\u53E5\u67C4(id) {
|
|
456
465
|
return this.\u8FDE\u63A5\u8868[id] ?? null;
|
|
457
466
|
}
|
|
@@ -465,6 +474,7 @@ var WebSocket\u7BA1\u7406\u5668 = class {
|
|
|
465
474
|
\u6E05\u7406\u51FD\u6570?.().catch((err) => this.log.error(`\u6E05\u7406\u8FDE\u63A5\u5931\u8D25, id: ${id}, \u9519\u8BEF: ${err}`));
|
|
466
475
|
delete this.\u8FDE\u63A5\u8868[id];
|
|
467
476
|
delete this.\u6E05\u7406\u51FD\u6570\u8868[id];
|
|
477
|
+
delete this.\u6D88\u606F\u76D1\u542C\u8868[id];
|
|
468
478
|
}
|
|
469
479
|
async \u6E05\u7406\u65E0\u6548\u8FDE\u63A5() {
|
|
470
480
|
let \u6E05\u7406\u6570\u91CF = 0;
|
|
@@ -486,11 +496,15 @@ var Global = new import_ts_global.GlobalService([
|
|
|
486
496
|
|
|
487
497
|
// src/plugin/extend/web-socket.ts
|
|
488
498
|
var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
489
|
-
constructor(\u4FE1\u606F\u63CF\u8FF0) {
|
|
499
|
+
constructor(\u540E\u63A8\u524D\u4FE1\u606F\u63CF\u8FF0, \u524D\u63A8\u540E\u4FE1\u606F\u63CF\u8FF0) {
|
|
490
500
|
super(
|
|
491
501
|
import_zod5.z.object({
|
|
492
502
|
ws\u64CD\u4F5C: import_zod5.z.object({
|
|
493
|
-
\u53D1\u9001ws\u4FE1\u606F: import_zod5.z.function(import_zod5.z.tuple([\u4FE1\u606F\u63CF\u8FF0]), import_zod5.z.promise(import_zod5.z.void())),
|
|
503
|
+
\u53D1\u9001ws\u4FE1\u606F: import_zod5.z.function(import_zod5.z.tuple([\u540E\u63A8\u524D\u4FE1\u606F\u63CF\u8FF0]), import_zod5.z.promise(import_zod5.z.void())),
|
|
504
|
+
\u76D1\u542Cws\u4FE1\u606F: import_zod5.z.function(
|
|
505
|
+
import_zod5.z.tuple([import_zod5.z.function(import_zod5.z.tuple([\u524D\u63A8\u540E\u4FE1\u606F\u63CF\u8FF0]), import_zod5.z.promise(import_zod5.z.void()))]),
|
|
506
|
+
import_zod5.z.promise(import_zod5.z.void())
|
|
507
|
+
),
|
|
494
508
|
\u5173\u95EDws\u8FDE\u63A5: import_zod5.z.function(import_zod5.z.tuple([]), import_zod5.z.promise(import_zod5.z.void())),
|
|
495
509
|
\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570: import_zod5.z.function(import_zod5.z.tuple([import_zod5.z.function(import_zod5.z.tuple([]), import_zod5.z.promise(import_zod5.z.void()))]), import_zod5.z.promise(import_zod5.z.void()))
|
|
496
510
|
}).or(import_zod5.z.null())
|
|
@@ -537,6 +551,17 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
|
|
|
537
551
|
async \u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(\u6E05\u7406\u51FD\u6570) {
|
|
538
552
|
await log2.debug("\u8BBE\u7F6E WebSocket \u6E05\u7406\u51FD\u6570", { wsId });
|
|
539
553
|
await WebSocket\u7BA1\u7406\u56682.\u8BBE\u7F6E\u6E05\u7406\u51FD\u6570(wsId, \u6E05\u7406\u51FD\u6570);
|
|
554
|
+
},
|
|
555
|
+
async \u76D1\u542Cws\u4FE1\u606F(\u56DE\u8C03\u51FD\u6570) {
|
|
556
|
+
if (ws\u53E5\u67C4 === null) {
|
|
557
|
+
ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(wsId);
|
|
558
|
+
}
|
|
559
|
+
if (ws\u53E5\u67C4 === null) {
|
|
560
|
+
await log2.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
|
|
561
|
+
return;
|
|
562
|
+
}
|
|
563
|
+
await log2.debug("\u6CE8\u518C WebSocket \u6D88\u606F\u76D1\u542C", { wsId });
|
|
564
|
+
await WebSocket\u7BA1\u7406\u56682.\u8BBE\u7F6E\u6D88\u606F\u76D1\u542C(wsId, \u56DE\u8C03\u51FD\u6570);
|
|
540
565
|
}
|
|
541
566
|
}
|
|
542
567
|
};
|
|
@@ -552,8 +577,8 @@ var import_node_os = require("os");
|
|
|
552
577
|
var import_short_uuid = __toESM(require("short-uuid"), 1);
|
|
553
578
|
var import_ws3 = require("ws");
|
|
554
579
|
var \u670D\u52A1\u5668 = class {
|
|
555
|
-
|
|
556
|
-
\
|
|
580
|
+
log;
|
|
581
|
+
\u65E5\u5FD7\u56DE\u8C03;
|
|
557
582
|
\u63A5\u53E3\u4EEC;
|
|
558
583
|
\u7AEF\u53E3;
|
|
559
584
|
\u9759\u6001\u8D44\u6E90\u8DEF\u5F84;
|
|
@@ -563,14 +588,17 @@ var \u670D\u52A1\u5668 = class {
|
|
|
563
588
|
this.\u7AEF\u53E3 = options.\u7AEF\u53E3;
|
|
564
589
|
this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 = options.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84;
|
|
565
590
|
this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84 = options.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84;
|
|
566
|
-
this.\
|
|
567
|
-
this
|
|
591
|
+
this.\u65E5\u5FD7\u56DE\u8C03 = options.\u65E5\u5FD7\u56DE\u8C03;
|
|
592
|
+
this.log = Global.getItem("log").then((a) => {
|
|
593
|
+
if (this.\u65E5\u5FD7\u56DE\u8C03 !== void 0) a.pipe(this.\u65E5\u5FD7\u56DE\u8C03);
|
|
594
|
+
return a;
|
|
595
|
+
});
|
|
568
596
|
}
|
|
569
597
|
async run() {
|
|
598
|
+
let log2 = await this.log;
|
|
570
599
|
let app = (0, import_express3.default)();
|
|
571
|
-
let \u7CFB\u7EDFlog = await this.\u7CFB\u7EDFlog;
|
|
572
600
|
if (this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84 !== void 0) {
|
|
573
|
-
await
|
|
601
|
+
await log2.debug(`\u8BBE\u7F6E\u9759\u6001\u8D44\u6E90\u8DEF\u5F84: ${this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84}`);
|
|
574
602
|
app.use(import_express3.default.static(this.\u9759\u6001\u8D44\u6E90\u8DEF\u5F84));
|
|
575
603
|
}
|
|
576
604
|
app.use(this.\u5904\u7406\u8BF7\u6C42.bind(this));
|
|
@@ -580,17 +608,16 @@ var \u670D\u52A1\u5668 = class {
|
|
|
580
608
|
}
|
|
581
609
|
async \u5904\u7406\u8BF7\u6C42(req, res) {
|
|
582
610
|
let \u8BF7\u6C42id = (0, import_short_uuid.default)().new();
|
|
583
|
-
let
|
|
584
|
-
let \u63A5\u53E3log = (await this.\u63A5\u53E3log).extend(\u8BF7\u6C42id);
|
|
611
|
+
let log2 = (await this.log).extend(\u8BF7\u6C42id);
|
|
585
612
|
let \u5F00\u59CB\u65F6\u95F4 = Date.now();
|
|
586
613
|
try {
|
|
587
614
|
let { path: \u8BF7\u6C42\u8DEF\u5F84, method } = req;
|
|
588
615
|
\u8BF7\u6C42\u8DEF\u5F84 = decodeURIComponent(\u8BF7\u6C42\u8DEF\u5F84);
|
|
589
616
|
let \u8BF7\u6C42\u65B9\u6CD5 = method.toLowerCase();
|
|
590
|
-
await
|
|
617
|
+
await log2.debug("\u6536\u5230\u8BF7\u6C42, \u8DEF\u5F84: %o, \u65B9\u6CD5: %o", \u8BF7\u6C42\u8DEF\u5F84, \u8BF7\u6C42\u65B9\u6CD5);
|
|
591
618
|
let \u76EE\u6807\u63A5\u53E3 = this.\u63A5\u53E3\u4EEC.find((\u63A5\u53E32) => \u8BF7\u6C42\u65B9\u6CD5 === \u63A5\u53E32.\u83B7\u5F97\u65B9\u6CD5() && \u8BF7\u6C42\u8DEF\u5F84 === \u63A5\u53E32.\u83B7\u5F97\u8DEF\u5F84()) ?? null;
|
|
592
619
|
if (\u76EE\u6807\u63A5\u53E3 !== null) {
|
|
593
|
-
await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91(req, res, \u76EE\u6807\u63A5\u53E3,
|
|
620
|
+
await this.\u5904\u7406\u63A5\u53E3\u903B\u8F91({ req, res, \u76EE\u6807\u63A5\u53E3, log: log2, \u8BF7\u6C42id });
|
|
594
621
|
return;
|
|
595
622
|
}
|
|
596
623
|
if (this.\u9ED8\u8BA4get\u6587\u4EF6\u8DEF\u5F84 !== void 0 && \u8BF7\u6C42\u65B9\u6CD5 === "get") {
|
|
@@ -599,35 +626,36 @@ var \u670D\u52A1\u5668 = class {
|
|
|
599
626
|
res.send(\u9ED8\u8BA4\u6587\u4EF6\u5185\u5BB9);
|
|
600
627
|
return;
|
|
601
628
|
} catch (e) {
|
|
602
|
-
await
|
|
629
|
+
await log2.error("\u8FD4\u56DE\u9ED8\u8BA4get\u6587\u4EF6\u5185\u5BB9\u5931\u8D25: %o", String(e));
|
|
603
630
|
}
|
|
604
631
|
}
|
|
605
|
-
await
|
|
632
|
+
await log2.debug("\u6CA1\u6709\u547D\u4E2D\u4EFB\u4F55\u8D44\u6E90");
|
|
606
633
|
res.status(404).end();
|
|
607
634
|
} catch (error) {
|
|
608
|
-
await
|
|
635
|
+
await log2.error(error);
|
|
609
636
|
res.status(500).send("\u670D\u52A1\u5668\u5185\u90E8\u9519\u8BEF");
|
|
610
637
|
} finally {
|
|
611
638
|
let \u8017\u65F6ms = Date.now() - \u5F00\u59CB\u65F6\u95F4;
|
|
612
|
-
await
|
|
639
|
+
await log2.info("\u8BF7\u6C42\u5B8C\u6210, \u8017\u65F6: %o ms", \u8017\u65F6ms);
|
|
613
640
|
}
|
|
614
641
|
}
|
|
615
|
-
async \u5904\u7406\u63A5\u53E3\u903B\u8F91(
|
|
642
|
+
async \u5904\u7406\u63A5\u53E3\u903B\u8F91(opt) {
|
|
643
|
+
let { req, res, \u76EE\u6807\u63A5\u53E3, log: log2, \u8BF7\u6C42id } = opt;
|
|
616
644
|
let \u63A5\u53E3\u903B\u8F912 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u903B\u8F91();
|
|
617
645
|
let \u7ED3\u679C\u8F6C\u6362\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8F6C\u6362\u5668();
|
|
618
646
|
let \u7ED3\u679C\u8FD4\u56DE\u5668 = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u7ED3\u679C\u8FD4\u56DE\u5668();
|
|
619
647
|
let \u603B\u5F00\u59CB = Date.now();
|
|
620
648
|
let \u5F00\u59CB = Date.now();
|
|
621
|
-
await
|
|
649
|
+
await log2.debug("\u8C03\u7528\u63A5\u53E3\u903B\u8F91...");
|
|
622
650
|
let \u63D2\u4EF6\u4EEC = \u63A5\u53E3\u903B\u8F912.\u83B7\u5F97\u63D2\u4EF6\u4EEC();
|
|
623
|
-
await
|
|
624
|
-
let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, { log: \
|
|
625
|
-
await
|
|
626
|
-
await
|
|
627
|
-
let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u63D2\u4EF6\u7ED3\u679C, {}, { log: \
|
|
628
|
-
await
|
|
651
|
+
await log2.debug("\u627E\u5230 %o \u4E2A \u63D2\u4EF6, \u51C6\u5907\u6267\u884C...", \u63D2\u4EF6\u4EEC.length);
|
|
652
|
+
let \u63D2\u4EF6\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u8BA1\u7B97\u63D2\u4EF6\u7ED3\u679C(req, res, { log: log2, \u8BF7\u6C42id });
|
|
653
|
+
await log2.debug("\u63D2\u4EF6 \u6267\u884C\u5B8C\u6BD5");
|
|
654
|
+
await log2.debug("\u51C6\u5907\u6267\u884C\u63A5\u53E3\u5B9E\u73B0...");
|
|
655
|
+
let \u63A5\u53E3\u7ED3\u679C = await \u63A5\u53E3\u903B\u8F912.\u901A\u8FC7\u63D2\u4EF6\u7ED3\u679C\u8FD0\u884C(\u63D2\u4EF6\u7ED3\u679C, {}, { log: log2, \u8BF7\u6C42id });
|
|
656
|
+
await log2.debug("\u63A5\u53E3\u5B9E\u73B0\u6267\u884C\u5B8C\u6BD5");
|
|
629
657
|
let \u63A5\u53E3\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
630
|
-
await
|
|
658
|
+
await log2.info("\u63A5\u53E3\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u63A5\u53E3\u8017\u65F6);
|
|
631
659
|
\u5F00\u59CB = Date.now();
|
|
632
660
|
let \u8F6C\u6362\u7ED3\u679C = \u7ED3\u679C\u8F6C\u6362\u5668.\u5B9E\u73B0(\u63A5\u53E3\u7ED3\u679C);
|
|
633
661
|
let \u9519\u8BEF\u7ED3\u679C = \u76EE\u6807\u63A5\u53E3.\u83B7\u5F97\u63A5\u53E3\u9519\u8BEF\u5F62\u5F0FZod().safeParse(\u8F6C\u6362\u7ED3\u679C);
|
|
@@ -639,59 +667,59 @@ var \u670D\u52A1\u5668 = class {
|
|
|
639
667
|
\u6700\u7EC8\u7ED3\u679C = \u6B63\u786E\u7ED3\u679C.data;
|
|
640
668
|
} else {
|
|
641
669
|
let \u7ED3\u679C\u5B57\u7B26\u4E32 = JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u8F6C\u6362\u7ED3\u679C));
|
|
642
|
-
await
|
|
643
|
-
await
|
|
644
|
-
await
|
|
670
|
+
await log2.error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C: ${\u7ED3\u679C\u5B57\u7B26\u4E32}`);
|
|
671
|
+
await log2.error("\u5BF9\u4E8E\u9519\u8BEF\u7ED3\u679C: %o", \u9519\u8BEF\u7ED3\u679C.error);
|
|
672
|
+
await log2.error("\u5BF9\u4E8E\u6B63\u786E\u7ED3\u679C: %o", \u6B63\u786E\u7ED3\u679C.error);
|
|
645
673
|
throw new Error(`\u8F6C\u6362\u7ED3\u679C\u65E0\u6CD5\u901A\u8FC7\u6821\u9A8C`);
|
|
646
674
|
}
|
|
647
675
|
let \u8F6C\u6362\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
648
|
-
await
|
|
649
|
-
await
|
|
676
|
+
await log2.info("\u7ED3\u679C\u8F6C\u6362\u4E0E\u6821\u9A8C\u5B8C\u6210, \u8017\u65F6: %o ms", \u8F6C\u6362\u8017\u65F6);
|
|
677
|
+
await log2.debug("\u6700\u7EC8\u7ED3\u679C: %o", JSON.stringify(\u9012\u5F52\u622A\u65AD\u5B57\u7B26\u4E32(\u6700\u7EC8\u7ED3\u679C)));
|
|
650
678
|
\u5F00\u59CB = Date.now();
|
|
651
679
|
await \u7ED3\u679C\u8FD4\u56DE\u5668.\u8FD4\u56DE(req, res, \u6700\u7EC8\u7ED3\u679C);
|
|
652
680
|
let \u8FD4\u56DE\u8017\u65F6 = Date.now() - \u5F00\u59CB;
|
|
653
|
-
await
|
|
681
|
+
await log2.info("\u8FD4\u56DE\u903B\u8F91\u6267\u884C\u5B8C\u6BD5, \u8017\u65F6: %o ms", \u8FD4\u56DE\u8017\u65F6);
|
|
654
682
|
let \u603B\u8017\u65F6 = Date.now() - \u603B\u5F00\u59CB;
|
|
655
|
-
await
|
|
683
|
+
await log2.info("\u63A5\u53E3\u5B8C\u6574\u6267\u884C\u8017\u65F6: %o ms", \u603B\u8017\u65F6);
|
|
656
684
|
}
|
|
657
685
|
async \u521D\u59CB\u5316WebSocket(server) {
|
|
686
|
+
let log2 = await this.log;
|
|
658
687
|
let wss = new import_ws3.WebSocketServer({ server });
|
|
659
|
-
let \u7CFB\u7EDFlog = await this.\u7CFB\u7EDFlog;
|
|
660
688
|
wss.on("listening", async () => {
|
|
661
|
-
await
|
|
689
|
+
await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
|
|
662
690
|
});
|
|
663
691
|
wss.on("error", async (err) => {
|
|
664
|
-
await
|
|
692
|
+
await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
|
|
665
693
|
});
|
|
666
694
|
wss.on("connection", async (ws, req) => {
|
|
667
|
-
let \
|
|
668
|
-
await \
|
|
695
|
+
let \u8FDE\u63A5log = log2.extend((0, import_short_uuid.default)().new());
|
|
696
|
+
await \u8FDE\u63A5log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
|
|
669
697
|
let \u5BA2\u6237\u7AEFid = req.url?.split("?id=")[1] ?? null;
|
|
670
698
|
if (\u5BA2\u6237\u7AEFid === null) {
|
|
671
|
-
await \
|
|
672
|
-
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \
|
|
699
|
+
await \u8FDE\u63A5log.error("\u8FDE\u63A5\u8BF7\u6C42\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
700
|
+
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u8FDE\u63A5log, 4001, "\u7F3A\u5C11\u5BA2\u6237\u7AEF ID");
|
|
673
701
|
}
|
|
674
|
-
await \
|
|
702
|
+
await \u8FDE\u63A5log.debug("\u89E3\u6790\u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
675
703
|
let WebSocket\u7BA1\u7406\u56682 = Global.getItemSync("WebSocket\u7BA1\u7406\u5668");
|
|
676
704
|
let \u8FDE\u63A5\u5DF2\u5B58\u5728 = WebSocket\u7BA1\u7406\u56682.\u67E5\u8BE2\u8FDE\u63A5\u5B58\u5728(\u5BA2\u6237\u7AEFid);
|
|
677
705
|
if (\u8FDE\u63A5\u5DF2\u5B58\u5728) {
|
|
678
|
-
await \
|
|
679
|
-
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \
|
|
706
|
+
await \u8FDE\u63A5log.error("\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728: %s", \u5BA2\u6237\u7AEFid);
|
|
707
|
+
return this.\u5173\u95EDWebSocket\u8FDE\u63A5(ws, \u8FDE\u63A5log, 4002, "\u5BA2\u6237\u7AEF ID \u5DF2\u5B58\u5728");
|
|
680
708
|
}
|
|
681
709
|
WebSocket\u7BA1\u7406\u56682.\u589E\u52A0\u8FDE\u63A5(\u5BA2\u6237\u7AEFid, ws);
|
|
682
|
-
await \
|
|
710
|
+
await \u8FDE\u63A5log.info("WebSocket \u8FDE\u63A5\u5DF2\u5EFA\u7ACB, \u5BA2\u6237\u7AEF ID: %s", \u5BA2\u6237\u7AEFid);
|
|
683
711
|
ws.on("close", async () => {
|
|
684
|
-
await \
|
|
712
|
+
await \u8FDE\u63A5log.info("WebSocket \u8FDE\u63A5\u5173\u95ED: %s", \u5BA2\u6237\u7AEFid);
|
|
685
713
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
686
714
|
});
|
|
687
715
|
ws.on("error", async (err) => {
|
|
688
|
-
await \
|
|
716
|
+
await \u8FDE\u63A5log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
|
|
689
717
|
WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
|
|
690
718
|
});
|
|
691
719
|
});
|
|
692
720
|
}
|
|
693
|
-
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws,
|
|
694
|
-
await
|
|
721
|
+
async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log2, code, reason) {
|
|
722
|
+
await log2.debug(`\u5173\u95ED WebSocket \u8FDE\u63A5, \u4EE3\u7801: ${code}, \u539F\u56E0: ${reason}`);
|
|
695
723
|
ws.close(code, reason);
|
|
696
724
|
}
|
|
697
725
|
\u83B7\u53D6\u672C\u5730\u5730\u5740() {
|
|
@@ -825,7 +853,7 @@ var \u6587\u4EF6\u4E0B\u8F7D\u8FD4\u56DE\u5668 = class extends \u63A5\u53E3\u7ED
|
|
|
825
853
|
EXPORT_TYPE,
|
|
826
854
|
Express\u517C\u5BB9\u63A5\u53E3\u5C01\u88C5,
|
|
827
855
|
GET\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
|
|
828
|
-
JSON\u89E3\u6790\u63D2\u4EF6,
|
|
856
|
+
JSON\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
|
|
829
857
|
WebSocket\u63D2\u4EF6,
|
|
830
858
|
\u5E38\u7528\u5F62\u5F0F\u5E76\u81EA\u5B9A\u4E49\u8FD4\u56DE\u5668\u63A5\u53E3\u5C01\u88C5,
|
|
831
859
|
\u5E38\u7528\u5F62\u5F0F\u63A5\u53E3\u5C01\u88C5,
|
|
@@ -847,6 +875,6 @@ var \u6587\u4EF6\u4E0B\u8F7D\u8FD4\u56DE\u5668 = class extends \u63A5\u53E3\u7ED
|
|
|
847
875
|
\u76F4\u63A5\u5F62\u5F0F\u8F6C\u6362\u5668,
|
|
848
876
|
\u81EA\u5B9A\u4E49\u6570\u636E\u63D2\u4EF6,
|
|
849
877
|
\u81EA\u5B9A\u4E49\u8FD4\u56DE\u5668,
|
|
850
|
-
\u8868\u5355\u89E3\u6790\u63D2\u4EF6,
|
|
878
|
+
\u8868\u5355\u53C2\u6570\u89E3\u6790\u63D2\u4EF6,
|
|
851
879
|
\u8C03\u8BD5\u8BF7\u6C42\u5934\u63D2\u4EF6
|
|
852
880
|
});
|