@maiyunnet/kebab 8.1.0 → 8.2.0
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/doc/kebab-rag.md +63 -55
- package/index.d.ts +1 -1
- package/index.js +1 -1
- package/lib/net.js +33 -9
- package/lib/session.d.ts +1 -0
- package/lib/session.js +2 -1
- package/lib/time.js +6 -0
- package/package.json +1 -1
- package/sys/monitor.js +4 -5
- package/www/example/ctr/test.js +9 -1
package/doc/kebab-rag.md
CHANGED
|
@@ -1385,7 +1385,7 @@ index/variables/VER.md
|
|
|
1385
1385
|
|
|
1386
1386
|
# Variable: VER
|
|
1387
1387
|
|
|
1388
|
-
> `const` **VER**: `"8.
|
|
1388
|
+
> `const` **VER**: `"8.2.0"` = `'8.2.0'`
|
|
1389
1389
|
|
|
1390
1390
|
Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
|
|
1391
1391
|
|
|
@@ -10413,7 +10413,7 @@ lib/net/functions/buildCookieQuery.md
|
|
|
10413
10413
|
|
|
10414
10414
|
> **buildCookieQuery**(`cookie`, `uri`): `string`
|
|
10415
10415
|
|
|
10416
|
-
Defined in: [lib/net.ts:
|
|
10416
|
+
Defined in: [lib/net.ts:628](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L628)
|
|
10417
10417
|
|
|
10418
10418
|
对象转换为 Cookie 拼接字符串(会自动筛掉不能发送的 cookie)
|
|
10419
10419
|
|
|
@@ -10483,7 +10483,7 @@ lib/net/functions/filterHeaders.md
|
|
|
10483
10483
|
|
|
10484
10484
|
> **filterHeaders**(`headers`, `res?`, `filter?`): `Record`\<`string`, `string` \| `string`[]\>
|
|
10485
10485
|
|
|
10486
|
-
Defined in: [lib/net.ts:
|
|
10486
|
+
Defined in: [lib/net.ts:706](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L706)
|
|
10487
10487
|
|
|
10488
10488
|
剔除不代理的 header,返回新的 header
|
|
10489
10489
|
|
|
@@ -10580,7 +10580,7 @@ lib/net/functions/getFormData.md
|
|
|
10580
10580
|
|
|
10581
10581
|
> **getFormData**(): [`FormData`](../formdata/classes/FormData.md)
|
|
10582
10582
|
|
|
10583
|
-
Defined in: [lib/net.ts:
|
|
10583
|
+
Defined in: [lib/net.ts:690](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L690)
|
|
10584
10584
|
|
|
10585
10585
|
创建 FormData 对象
|
|
10586
10586
|
|
|
@@ -10601,7 +10601,7 @@ lib/net/functions/mproxy.md
|
|
|
10601
10601
|
|
|
10602
10602
|
> **mproxy**(`ctr`, `auth`, `opt?`): `Promise`\<`number`\>
|
|
10603
10603
|
|
|
10604
|
-
Defined in: [lib/net.ts:
|
|
10604
|
+
Defined in: [lib/net.ts:742](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L742)
|
|
10605
10605
|
|
|
10606
10606
|
正向 mproxy 代理,注意提前处理不要自动处理 post 数据,读取 get 的 url 为实际请求地址
|
|
10607
10607
|
get: url, auth
|
|
@@ -10643,7 +10643,7 @@ lib/net/functions/mproxyData.md
|
|
|
10643
10643
|
|
|
10644
10644
|
> **mproxyData**(`ctr`): `any`
|
|
10645
10645
|
|
|
10646
|
-
Defined in: [lib/net.ts:
|
|
10646
|
+
Defined in: [lib/net.ts:791](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L791)
|
|
10647
10647
|
|
|
10648
10648
|
获取 mproxy 的附加数据
|
|
10649
10649
|
|
|
@@ -10861,7 +10861,7 @@ lib/net/functions/resetCookieSession.md
|
|
|
10861
10861
|
|
|
10862
10862
|
> **resetCookieSession**(`cookie`): `void`
|
|
10863
10863
|
|
|
10864
|
-
Defined in: [lib/net.ts:
|
|
10864
|
+
Defined in: [lib/net.ts:678](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L678)
|
|
10865
10865
|
|
|
10866
10866
|
模拟重启浏览器后的状态
|
|
10867
10867
|
|
|
@@ -10890,7 +10890,7 @@ lib/net/functions/rproxy.md
|
|
|
10890
10890
|
|
|
10891
10891
|
> **rproxy**(`ctr`, `route`, `opt?`): `Promise`\<`boolean`\>
|
|
10892
10892
|
|
|
10893
|
-
Defined in: [lib/net.ts:
|
|
10893
|
+
Defined in: [lib/net.ts:809](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L809)
|
|
10894
10894
|
|
|
10895
10895
|
反向代理,注意提前处理不要自动处理 post 数据,将本服务器的某个路由反代到其他网址
|
|
10896
10896
|
|
|
@@ -11037,7 +11037,7 @@ lib/net/interfaces/ICookie.md
|
|
|
11037
11037
|
|
|
11038
11038
|
# Interface: ICookie
|
|
11039
11039
|
|
|
11040
|
-
Defined in: [lib/net.ts:
|
|
11040
|
+
Defined in: [lib/net.ts:934](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L934)
|
|
11041
11041
|
|
|
11042
11042
|
Net Cookie 对象
|
|
11043
11043
|
|
|
@@ -11047,7 +11047,7 @@ Net Cookie 对象
|
|
|
11047
11047
|
|
|
11048
11048
|
> **domain**: `string`
|
|
11049
11049
|
|
|
11050
|
-
Defined in: [lib/net.ts:
|
|
11050
|
+
Defined in: [lib/net.ts:940](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L940)
|
|
11051
11051
|
|
|
11052
11052
|
***
|
|
11053
11053
|
|
|
@@ -11055,7 +11055,7 @@ Defined in: [lib/net.ts:916](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11055
11055
|
|
|
11056
11056
|
> **exp**: `number`
|
|
11057
11057
|
|
|
11058
|
-
Defined in: [lib/net.ts:
|
|
11058
|
+
Defined in: [lib/net.ts:938](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L938)
|
|
11059
11059
|
|
|
11060
11060
|
有效期秒级时间戳
|
|
11061
11061
|
|
|
@@ -11065,7 +11065,7 @@ Defined in: [lib/net.ts:914](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11065
11065
|
|
|
11066
11066
|
> **httponly**: `boolean`
|
|
11067
11067
|
|
|
11068
|
-
Defined in: [lib/net.ts:
|
|
11068
|
+
Defined in: [lib/net.ts:942](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L942)
|
|
11069
11069
|
|
|
11070
11070
|
***
|
|
11071
11071
|
|
|
@@ -11073,7 +11073,7 @@ Defined in: [lib/net.ts:918](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11073
11073
|
|
|
11074
11074
|
> **name**: `string`
|
|
11075
11075
|
|
|
11076
|
-
Defined in: [lib/net.ts:
|
|
11076
|
+
Defined in: [lib/net.ts:935](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L935)
|
|
11077
11077
|
|
|
11078
11078
|
***
|
|
11079
11079
|
|
|
@@ -11081,7 +11081,7 @@ Defined in: [lib/net.ts:911](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11081
11081
|
|
|
11082
11082
|
> **path**: `string`
|
|
11083
11083
|
|
|
11084
|
-
Defined in: [lib/net.ts:
|
|
11084
|
+
Defined in: [lib/net.ts:939](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L939)
|
|
11085
11085
|
|
|
11086
11086
|
***
|
|
11087
11087
|
|
|
@@ -11089,7 +11089,7 @@ Defined in: [lib/net.ts:915](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11089
11089
|
|
|
11090
11090
|
> **secure**: `boolean`
|
|
11091
11091
|
|
|
11092
|
-
Defined in: [lib/net.ts:
|
|
11092
|
+
Defined in: [lib/net.ts:941](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L941)
|
|
11093
11093
|
|
|
11094
11094
|
***
|
|
11095
11095
|
|
|
@@ -11097,7 +11097,7 @@ Defined in: [lib/net.ts:917](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11097
11097
|
|
|
11098
11098
|
> **value**: `string`
|
|
11099
11099
|
|
|
11100
|
-
Defined in: [lib/net.ts:
|
|
11100
|
+
Defined in: [lib/net.ts:936](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L936)
|
|
11101
11101
|
|
|
11102
11102
|
lib/net/interfaces/IMproxyOptions.md
|
|
11103
11103
|
---
|
|
@@ -11110,7 +11110,7 @@ lib/net/interfaces/IMproxyOptions.md
|
|
|
11110
11110
|
|
|
11111
11111
|
# Interface: IMproxyOptions
|
|
11112
11112
|
|
|
11113
|
-
Defined in: [lib/net.ts:
|
|
11113
|
+
Defined in: [lib/net.ts:889](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L889)
|
|
11114
11114
|
|
|
11115
11115
|
正向代理请求的传入参数选项
|
|
11116
11116
|
|
|
@@ -11120,7 +11120,7 @@ Defined in: [lib/net.ts:865](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11120
11120
|
|
|
11121
11121
|
> `optional` **filter**: (`h`) => `boolean`
|
|
11122
11122
|
|
|
11123
|
-
Defined in: [lib/net.ts:
|
|
11123
|
+
Defined in: [lib/net.ts:898](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L898)
|
|
11124
11124
|
|
|
11125
11125
|
过滤 header,返回 true 则留下
|
|
11126
11126
|
|
|
@@ -11140,7 +11140,7 @@ Defined in: [lib/net.ts:874](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11140
11140
|
|
|
11141
11141
|
> `optional` **follow**: `number`
|
|
11142
11142
|
|
|
11143
|
-
Defined in: [lib/net.ts:
|
|
11143
|
+
Defined in: [lib/net.ts:892](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L892)
|
|
11144
11144
|
|
|
11145
11145
|
***
|
|
11146
11146
|
|
|
@@ -11148,7 +11148,7 @@ Defined in: [lib/net.ts:868](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11148
11148
|
|
|
11149
11149
|
> `optional` **headers**: [`THttpHeaders`](../type-aliases/THttpHeaders.md)
|
|
11150
11150
|
|
|
11151
|
-
Defined in: [lib/net.ts:
|
|
11151
|
+
Defined in: [lib/net.ts:896](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L896)
|
|
11152
11152
|
|
|
11153
11153
|
***
|
|
11154
11154
|
|
|
@@ -11156,7 +11156,7 @@ Defined in: [lib/net.ts:872](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11156
11156
|
|
|
11157
11157
|
> `optional` **hosts**: `string` \| `Record`\<`string`, `string`\>
|
|
11158
11158
|
|
|
11159
|
-
Defined in: [lib/net.ts:
|
|
11159
|
+
Defined in: [lib/net.ts:894](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L894)
|
|
11160
11160
|
|
|
11161
11161
|
自定义 host 映射,如 {'www.maiyun.net': '127.0.0.1'},或全部映射到一个 host
|
|
11162
11162
|
|
|
@@ -11166,7 +11166,7 @@ Defined in: [lib/net.ts:870](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11166
11166
|
|
|
11167
11167
|
> `optional` **local**: `string`
|
|
11168
11168
|
|
|
11169
|
-
Defined in: [lib/net.ts:
|
|
11169
|
+
Defined in: [lib/net.ts:895](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L895)
|
|
11170
11170
|
|
|
11171
11171
|
***
|
|
11172
11172
|
|
|
@@ -11174,7 +11174,7 @@ Defined in: [lib/net.ts:871](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11174
11174
|
|
|
11175
11175
|
> `optional` **reuse**: `string`
|
|
11176
11176
|
|
|
11177
|
-
Defined in: [lib/net.ts:
|
|
11177
|
+
Defined in: [lib/net.ts:900](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L900)
|
|
11178
11178
|
|
|
11179
11179
|
默认为 default
|
|
11180
11180
|
|
|
@@ -11184,7 +11184,7 @@ Defined in: [lib/net.ts:876](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11184
11184
|
|
|
11185
11185
|
> `optional` **timeout**: `number`
|
|
11186
11186
|
|
|
11187
|
-
Defined in: [lib/net.ts:
|
|
11187
|
+
Defined in: [lib/net.ts:891](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L891)
|
|
11188
11188
|
|
|
11189
11189
|
秒数
|
|
11190
11190
|
|
|
@@ -11199,7 +11199,7 @@ lib/net/interfaces/IRequestOptions.md
|
|
|
11199
11199
|
|
|
11200
11200
|
# Interface: IRequestOptions
|
|
11201
11201
|
|
|
11202
|
-
Defined in: [lib/net.ts:
|
|
11202
|
+
Defined in: [lib/net.ts:862](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L862)
|
|
11203
11203
|
|
|
11204
11204
|
请求的传入参数选项
|
|
11205
11205
|
|
|
@@ -11209,7 +11209,7 @@ Defined in: [lib/net.ts:838](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11209
11209
|
|
|
11210
11210
|
> `optional` **cookie**: `Record`\<`string`, [`ICookie`](ICookie.md)\>
|
|
11211
11211
|
|
|
11212
|
-
Defined in: [lib/net.ts:
|
|
11212
|
+
Defined in: [lib/net.ts:885](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L885)
|
|
11213
11213
|
|
|
11214
11214
|
cookie 托管对象
|
|
11215
11215
|
|
|
@@ -11219,7 +11219,7 @@ cookie 托管对象
|
|
|
11219
11219
|
|
|
11220
11220
|
> `optional` **follow**: `number`
|
|
11221
11221
|
|
|
11222
|
-
Defined in: [lib/net.ts:
|
|
11222
|
+
Defined in: [lib/net.ts:868](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L868)
|
|
11223
11223
|
|
|
11224
11224
|
追踪 location 次数,0 为不追踪,默认为 0
|
|
11225
11225
|
|
|
@@ -11229,7 +11229,7 @@ Defined in: [lib/net.ts:844](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11229
11229
|
|
|
11230
11230
|
> `optional` **headers**: [`THttpHeaders`](../type-aliases/THttpHeaders.md)
|
|
11231
11231
|
|
|
11232
|
-
Defined in: [lib/net.ts:
|
|
11232
|
+
Defined in: [lib/net.ts:873](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L873)
|
|
11233
11233
|
|
|
11234
11234
|
***
|
|
11235
11235
|
|
|
@@ -11237,7 +11237,7 @@ Defined in: [lib/net.ts:849](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11237
11237
|
|
|
11238
11238
|
> `optional` **hosts**: `string` \| `Record`\<`string`, `string`\>
|
|
11239
11239
|
|
|
11240
|
-
Defined in: [lib/net.ts:
|
|
11240
|
+
Defined in: [lib/net.ts:870](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L870)
|
|
11241
11241
|
|
|
11242
11242
|
自定义 host 映射,如 {'www.maiyun.net': '127.0.0.1'},或全部映射到一个 host
|
|
11243
11243
|
|
|
@@ -11247,7 +11247,7 @@ Defined in: [lib/net.ts:846](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11247
11247
|
|
|
11248
11248
|
> `optional` **keep**: `boolean`
|
|
11249
11249
|
|
|
11250
|
-
Defined in: [lib/net.ts:
|
|
11250
|
+
Defined in: [lib/net.ts:881](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L881)
|
|
11251
11251
|
|
|
11252
11252
|
连接是否保持长连接(即是否允许复用),默认为 true
|
|
11253
11253
|
|
|
@@ -11257,7 +11257,7 @@ Defined in: [lib/net.ts:857](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11257
11257
|
|
|
11258
11258
|
> `optional` **local**: `string`
|
|
11259
11259
|
|
|
11260
|
-
Defined in: [lib/net.ts:
|
|
11260
|
+
Defined in: [lib/net.ts:872](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L872)
|
|
11261
11261
|
|
|
11262
11262
|
***
|
|
11263
11263
|
|
|
@@ -11265,7 +11265,7 @@ Defined in: [lib/net.ts:848](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11265
11265
|
|
|
11266
11266
|
> `optional` **method**: `"GET"` \| `"POST"` \| `"PUT"` \| `"DELETE"` \| `"OPTIONS"`
|
|
11267
11267
|
|
|
11268
|
-
Defined in: [lib/net.ts:
|
|
11268
|
+
Defined in: [lib/net.ts:863](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L863)
|
|
11269
11269
|
|
|
11270
11270
|
***
|
|
11271
11271
|
|
|
@@ -11273,7 +11273,7 @@ Defined in: [lib/net.ts:839](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11273
11273
|
|
|
11274
11274
|
> `optional` **mproxy**: `object`
|
|
11275
11275
|
|
|
11276
|
-
Defined in: [lib/net.ts:
|
|
11276
|
+
Defined in: [lib/net.ts:875](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L875)
|
|
11277
11277
|
|
|
11278
11278
|
正向 mproxy 代理,url 如 https://xxx/abc
|
|
11279
11279
|
|
|
@@ -11295,7 +11295,7 @@ Defined in: [lib/net.ts:851](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11295
11295
|
|
|
11296
11296
|
> `optional` **reuse**: `string`
|
|
11297
11297
|
|
|
11298
|
-
Defined in: [lib/net.ts:
|
|
11298
|
+
Defined in: [lib/net.ts:883](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L883)
|
|
11299
11299
|
|
|
11300
11300
|
复用池名,默认为 default
|
|
11301
11301
|
|
|
@@ -11305,7 +11305,7 @@ Defined in: [lib/net.ts:859](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11305
11305
|
|
|
11306
11306
|
> `optional` **save**: `string`
|
|
11307
11307
|
|
|
11308
|
-
Defined in: [lib/net.ts:
|
|
11308
|
+
Defined in: [lib/net.ts:871](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L871)
|
|
11309
11309
|
|
|
11310
11310
|
***
|
|
11311
11311
|
|
|
@@ -11313,7 +11313,7 @@ Defined in: [lib/net.ts:847](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11313
11313
|
|
|
11314
11314
|
> `optional` **timeout**: `number`
|
|
11315
11315
|
|
|
11316
|
-
Defined in: [lib/net.ts:
|
|
11316
|
+
Defined in: [lib/net.ts:866](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L866)
|
|
11317
11317
|
|
|
11318
11318
|
秒数
|
|
11319
11319
|
|
|
@@ -11323,7 +11323,7 @@ Defined in: [lib/net.ts:842](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11323
11323
|
|
|
11324
11324
|
> `optional` **type**: `"form"` \| `"json"`
|
|
11325
11325
|
|
|
11326
|
-
Defined in: [lib/net.ts:
|
|
11326
|
+
Defined in: [lib/net.ts:864](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L864)
|
|
11327
11327
|
|
|
11328
11328
|
lib/net/interfaces/IRproxyOptions.md
|
|
11329
11329
|
---
|
|
@@ -11336,7 +11336,7 @@ lib/net/interfaces/IRproxyOptions.md
|
|
|
11336
11336
|
|
|
11337
11337
|
# Interface: IRproxyOptions
|
|
11338
11338
|
|
|
11339
|
-
Defined in: [lib/net.ts:
|
|
11339
|
+
Defined in: [lib/net.ts:904](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L904)
|
|
11340
11340
|
|
|
11341
11341
|
反向代理请求的传入参数选项
|
|
11342
11342
|
|
|
@@ -11346,7 +11346,7 @@ Defined in: [lib/net.ts:880](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11346
11346
|
|
|
11347
11347
|
> `optional` **filter**: (`h`) => `boolean`
|
|
11348
11348
|
|
|
11349
|
-
Defined in: [lib/net.ts:
|
|
11349
|
+
Defined in: [lib/net.ts:913](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L913)
|
|
11350
11350
|
|
|
11351
11351
|
过滤 header,返回 true 则留下
|
|
11352
11352
|
|
|
@@ -11366,7 +11366,7 @@ Defined in: [lib/net.ts:889](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11366
11366
|
|
|
11367
11367
|
> `optional` **follow**: `number`
|
|
11368
11368
|
|
|
11369
|
-
Defined in: [lib/net.ts:
|
|
11369
|
+
Defined in: [lib/net.ts:907](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L907)
|
|
11370
11370
|
|
|
11371
11371
|
***
|
|
11372
11372
|
|
|
@@ -11374,7 +11374,7 @@ Defined in: [lib/net.ts:883](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11374
11374
|
|
|
11375
11375
|
> `optional` **headers**: [`THttpHeaders`](../type-aliases/THttpHeaders.md)
|
|
11376
11376
|
|
|
11377
|
-
Defined in: [lib/net.ts:
|
|
11377
|
+
Defined in: [lib/net.ts:911](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L911)
|
|
11378
11378
|
|
|
11379
11379
|
***
|
|
11380
11380
|
|
|
@@ -11382,7 +11382,7 @@ Defined in: [lib/net.ts:887](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11382
11382
|
|
|
11383
11383
|
> `optional` **hosts**: `string` \| `Record`\<`string`, `string`\>
|
|
11384
11384
|
|
|
11385
|
-
Defined in: [lib/net.ts:
|
|
11385
|
+
Defined in: [lib/net.ts:909](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L909)
|
|
11386
11386
|
|
|
11387
11387
|
自定义 host 映射,如 {'www.maiyun.net': '127.0.0.1'},或全部映射到一个 host
|
|
11388
11388
|
|
|
@@ -11392,7 +11392,7 @@ Defined in: [lib/net.ts:885](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11392
11392
|
|
|
11393
11393
|
> `optional` **local**: `string`
|
|
11394
11394
|
|
|
11395
|
-
Defined in: [lib/net.ts:
|
|
11395
|
+
Defined in: [lib/net.ts:910](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L910)
|
|
11396
11396
|
|
|
11397
11397
|
***
|
|
11398
11398
|
|
|
@@ -11400,7 +11400,7 @@ Defined in: [lib/net.ts:886](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11400
11400
|
|
|
11401
11401
|
> `optional` **mproxy**: `object`
|
|
11402
11402
|
|
|
11403
|
-
Defined in: [lib/net.ts:
|
|
11403
|
+
Defined in: [lib/net.ts:915](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L915)
|
|
11404
11404
|
|
|
11405
11405
|
正向 mproxy 代理,url 如 https://xxx/abc
|
|
11406
11406
|
|
|
@@ -11422,7 +11422,7 @@ Defined in: [lib/net.ts:891](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11422
11422
|
|
|
11423
11423
|
> `optional` **reuse**: `string`
|
|
11424
11424
|
|
|
11425
|
-
Defined in: [lib/net.ts:
|
|
11425
|
+
Defined in: [lib/net.ts:921](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L921)
|
|
11426
11426
|
|
|
11427
11427
|
默认为 default
|
|
11428
11428
|
|
|
@@ -11432,7 +11432,7 @@ Defined in: [lib/net.ts:897](https://github.com/maiyunnet/kebab/blob/master/lib/
|
|
|
11432
11432
|
|
|
11433
11433
|
> `optional` **timeout**: `number`
|
|
11434
11434
|
|
|
11435
|
-
Defined in: [lib/net.ts:
|
|
11435
|
+
Defined in: [lib/net.ts:906](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L906)
|
|
11436
11436
|
|
|
11437
11437
|
秒数
|
|
11438
11438
|
|
|
@@ -11893,7 +11893,7 @@ lib/net/type-aliases/THttpHeaders.md
|
|
|
11893
11893
|
|
|
11894
11894
|
> **THttpHeaders** = `http.IncomingHttpHeaders` & `object`
|
|
11895
11895
|
|
|
11896
|
-
Defined in: [lib/net.ts:
|
|
11896
|
+
Defined in: [lib/net.ts:926](https://github.com/maiyunnet/kebab/blob/master/lib/net.ts#L926)
|
|
11897
11897
|
|
|
11898
11898
|
http headers
|
|
11899
11899
|
|
|
@@ -12710,7 +12710,7 @@ lib/session/classes/Session.md
|
|
|
12710
12710
|
|
|
12711
12711
|
# Class: Session
|
|
12712
12712
|
|
|
12713
|
-
Defined in: [lib/session.ts:
|
|
12713
|
+
Defined in: [lib/session.ts:38](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L38)
|
|
12714
12714
|
|
|
12715
12715
|
## Constructors
|
|
12716
12716
|
|
|
@@ -12728,7 +12728,7 @@ Defined in: [lib/session.ts:37](https://github.com/maiyunnet/kebab/blob/master/l
|
|
|
12728
12728
|
|
|
12729
12729
|
> **getName**(): `string`
|
|
12730
12730
|
|
|
12731
|
-
Defined in: [lib/session.ts:
|
|
12731
|
+
Defined in: [lib/session.ts:203](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L203)
|
|
12732
12732
|
|
|
12733
12733
|
获取当前的 cookie 的 name 值
|
|
12734
12734
|
|
|
@@ -12742,7 +12742,7 @@ Defined in: [lib/session.ts:201](https://github.com/maiyunnet/kebab/blob/master/
|
|
|
12742
12742
|
|
|
12743
12743
|
> **getToken**(): `string`
|
|
12744
12744
|
|
|
12745
|
-
Defined in: [lib/session.ts:
|
|
12745
|
+
Defined in: [lib/session.ts:196](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L196)
|
|
12746
12746
|
|
|
12747
12747
|
获取当前的 token 值
|
|
12748
12748
|
|
|
@@ -12756,7 +12756,7 @@ Defined in: [lib/session.ts:194](https://github.com/maiyunnet/kebab/blob/master/
|
|
|
12756
12756
|
|
|
12757
12757
|
> **init**(`ctr`, `link`, `auth?`, `opt?`): `Promise`\<`boolean`\>
|
|
12758
12758
|
|
|
12759
|
-
Defined in: [lib/session.ts:
|
|
12759
|
+
Defined in: [lib/session.ts:66](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L66)
|
|
12760
12760
|
|
|
12761
12761
|
初始化函数,相当于 construct
|
|
12762
12762
|
|
|
@@ -12798,7 +12798,7 @@ false 表示系统错误
|
|
|
12798
12798
|
|
|
12799
12799
|
> **update**(): `Promise`\<`void`\>
|
|
12800
12800
|
|
|
12801
|
-
Defined in: [lib/session.ts:
|
|
12801
|
+
Defined in: [lib/session.ts:210](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L210)
|
|
12802
12802
|
|
|
12803
12803
|
页面整体结束时,要写入到 Kv 或 数据库
|
|
12804
12804
|
|
|
@@ -12840,6 +12840,14 @@ Defined in: [lib/session.ts:30](https://github.com/maiyunnet/kebab/blob/master/l
|
|
|
12840
12840
|
|
|
12841
12841
|
## Properties
|
|
12842
12842
|
|
|
12843
|
+
### domain?
|
|
12844
|
+
|
|
12845
|
+
> `optional` **domain**: `string`
|
|
12846
|
+
|
|
12847
|
+
Defined in: [lib/session.ts:34](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L34)
|
|
12848
|
+
|
|
12849
|
+
***
|
|
12850
|
+
|
|
12843
12851
|
### name?
|
|
12844
12852
|
|
|
12845
12853
|
> `optional` **name**: `string`
|
|
@@ -12852,7 +12860,7 @@ Defined in: [lib/session.ts:31](https://github.com/maiyunnet/kebab/blob/master/l
|
|
|
12852
12860
|
|
|
12853
12861
|
> `optional` **sqlPre**: `string`
|
|
12854
12862
|
|
|
12855
|
-
Defined in: [lib/session.ts:
|
|
12863
|
+
Defined in: [lib/session.ts:35](https://github.com/maiyunnet/kebab/blob/master/lib/session.ts#L35)
|
|
12856
12864
|
|
|
12857
12865
|
***
|
|
12858
12866
|
|
|
@@ -16527,7 +16535,7 @@ lib/time/functions/format.md
|
|
|
16527
16535
|
|
|
16528
16536
|
> **format**(`zone`, `f`, `date?`): `string`
|
|
16529
16537
|
|
|
16530
|
-
Defined in: [lib/time.ts:
|
|
16538
|
+
Defined in: [lib/time.ts:167](https://github.com/maiyunnet/kebab/blob/master/lib/time.ts#L167)
|
|
16531
16539
|
|
|
16532
16540
|
将时间对象转换为时间字符串
|
|
16533
16541
|
|
|
@@ -16599,7 +16607,7 @@ lib/time/functions/isMs.md
|
|
|
16599
16607
|
|
|
16600
16608
|
> **isMs**(`time`): `boolean`
|
|
16601
16609
|
|
|
16602
|
-
Defined in: [lib/time.ts:
|
|
16610
|
+
Defined in: [lib/time.ts:157](https://github.com/maiyunnet/kebab/blob/master/lib/time.ts#L157)
|
|
16603
16611
|
|
|
16604
16612
|
是否是毫秒
|
|
16605
16613
|
|
package/index.d.ts
CHANGED
package/index.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* --- 本文件用来定义每个目录实体地址的常量 ---
|
|
7
7
|
*/
|
|
8
8
|
/** --- 当前系统版本号 --- */
|
|
9
|
-
export const VER = '8.
|
|
9
|
+
export const VER = '8.2.0';
|
|
10
10
|
// --- 服务端用的路径 ---
|
|
11
11
|
const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
|
|
12
12
|
/** --- /xxx/xxx --- */
|
package/lib/net.js
CHANGED
|
@@ -452,12 +452,25 @@ async function buildCookieObject(cookie, setCookies, uri) {
|
|
|
452
452
|
for (let index = 0; index < list.length; ++index) {
|
|
453
453
|
const item = list[index];
|
|
454
454
|
const arr = item.split('=');
|
|
455
|
+
/** --- 提取 key 并修整 --- */
|
|
455
456
|
const key = arr[0].trim();
|
|
456
|
-
|
|
457
|
+
if (key === '') {
|
|
458
|
+
continue;
|
|
459
|
+
}
|
|
460
|
+
/** --- 提取 value --- */
|
|
461
|
+
let val = '';
|
|
462
|
+
if (arr.length > 1) {
|
|
463
|
+
val = item.slice(item.indexOf('=') + 1).trim();
|
|
464
|
+
}
|
|
457
465
|
if (index === 0) {
|
|
458
466
|
// --- 用户定义的信息 ---
|
|
459
467
|
cookieTmp['name'] = key;
|
|
460
|
-
|
|
468
|
+
try {
|
|
469
|
+
cookieTmp['value'] = decodeURIComponent(val);
|
|
470
|
+
}
|
|
471
|
+
catch {
|
|
472
|
+
cookieTmp['value'] = val;
|
|
473
|
+
}
|
|
461
474
|
}
|
|
462
475
|
else {
|
|
463
476
|
// --- cookie 配置信息,可转小写方便读取 ---
|
|
@@ -507,15 +520,26 @@ async function buildCookieObject(cookie, setCookies, uri) {
|
|
|
507
520
|
}
|
|
508
521
|
}
|
|
509
522
|
const cookieKey = cookieTmp['name'] + '-' + domainN;
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
523
|
+
let exp = -1992199400;
|
|
524
|
+
if (cookieTmp['max-age'] !== undefined) {
|
|
525
|
+
const maxAge = Number(cookieTmp['max-age']);
|
|
526
|
+
if (!(isNaN(maxAge))) {
|
|
527
|
+
if (maxAge <= 0) {
|
|
528
|
+
delete cookie[cookieKey];
|
|
529
|
+
continue;
|
|
530
|
+
}
|
|
531
|
+
exp = tim + maxAge;
|
|
514
532
|
}
|
|
515
533
|
}
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
534
|
+
if ((exp === -1992199400) && cookieTmp['expires']) {
|
|
535
|
+
const expires = lTime.stamp(cookieTmp['expires']);
|
|
536
|
+
if (!(isNaN(expires))) {
|
|
537
|
+
if (expires <= tim) {
|
|
538
|
+
delete cookie[cookieKey];
|
|
539
|
+
continue;
|
|
540
|
+
}
|
|
541
|
+
exp = expires;
|
|
542
|
+
}
|
|
519
543
|
}
|
|
520
544
|
// --- path ---
|
|
521
545
|
let path = cookieTmp['path'] ?? '';
|
package/lib/session.d.ts
CHANGED
package/lib/session.js
CHANGED
package/lib/time.js
CHANGED
|
@@ -105,6 +105,12 @@ export function stamp(date, zone) {
|
|
|
105
105
|
return Math.floor(date.getTime() / 1000);
|
|
106
106
|
}
|
|
107
107
|
if (zone === null || zone === undefined) {
|
|
108
|
+
/** --- 如果不传 zone,则尝试由 Date 自行解析(能自动识别字符串内的时区) --- */
|
|
109
|
+
const t = (new Date(date)).getTime();
|
|
110
|
+
if (!isNaN(t)) {
|
|
111
|
+
return Math.floor(t / 1000);
|
|
112
|
+
}
|
|
113
|
+
/** --- 解析不到的情况下走系统默认时区 --- */
|
|
108
114
|
zone = -(new Date()).getTimezoneOffset();
|
|
109
115
|
}
|
|
110
116
|
else if (zone instanceof sCtr.Ctr) {
|
package/package.json
CHANGED
package/sys/monitor.js
CHANGED
|
@@ -82,9 +82,8 @@ export function start(opt) {
|
|
|
82
82
|
memThreshold = opt?.mem ?? 0;
|
|
83
83
|
eloopThreshold = opt?.eloop ?? 500;
|
|
84
84
|
if (memThreshold === 0) {
|
|
85
|
-
// --- 自动计算:系统总内存的 80%
|
|
86
|
-
|
|
87
|
-
memThreshold = Math.floor((os.totalmem() * 0.8) / cpuCount / 1024 / 1024);
|
|
85
|
+
// --- 自动计算:系统总内存的 80% ---
|
|
86
|
+
memThreshold = Math.floor((os.totalmem() * 0.8) / 1024 / 1024);
|
|
88
87
|
}
|
|
89
88
|
lastCpuUsage = process.cpuUsage();
|
|
90
89
|
lastCpuTime = Date.now();
|
|
@@ -102,7 +101,7 @@ export function start(opt) {
|
|
|
102
101
|
timer = setInterval(check, INTERVAL);
|
|
103
102
|
// --- 启动看门狗线程 ---
|
|
104
103
|
startWatchdog();
|
|
105
|
-
lCore.debug(`[MONITOR] Started, CPU: ${cpuThreshold}%, MEM: ${memThreshold}MB, ELOOP: ${eloopThreshold}ms`);
|
|
104
|
+
lCore.debug(`[MONITOR] [PARENT] [${process.pid}] Started, CPU Threshold: ${cpuThreshold}%, MEM Threshold: ${memThreshold}MB, ELOOP Threshold: ${eloopThreshold}ms`);
|
|
106
105
|
}
|
|
107
106
|
/**
|
|
108
107
|
* --- 停止性能监控 ---
|
|
@@ -162,7 +161,7 @@ function startWatchdog() {
|
|
|
162
161
|
watchdog = null;
|
|
163
162
|
}
|
|
164
163
|
});
|
|
165
|
-
lCore.debug(
|
|
164
|
+
lCore.debug(`[MONITOR] [THREAD] [${process.pid}] Watchdog started`);
|
|
166
165
|
}
|
|
167
166
|
catch (e) {
|
|
168
167
|
lCore.debug('[MONITOR] Failed to start watchdog', e);
|
package/www/example/ctr/test.js
CHANGED
|
@@ -1800,7 +1800,7 @@ error: ${JSON.stringify(res.error)}`);
|
|
|
1800
1800
|
lNet.get(this._internalUrl + 'test/net-cookie1', {
|
|
1801
1801
|
'cookie': cookie
|
|
1802
1802
|
});</pre>
|
|
1803
|
-
headers: <pre>${JSON.stringify(res.headers, null, 4)}</pre>
|
|
1803
|
+
headers: <pre>${lText.htmlescape(JSON.stringify(res.headers, null, 4))}</pre>
|
|
1804
1804
|
content: <pre>${(await res.getContent())?.toString() ?? 'null'}</pre>
|
|
1805
1805
|
cookie: <pre>${JSON.stringify(cookie, null, 4)}</pre><hr>`);
|
|
1806
1806
|
res = await lNet.get(this._internalUrl + 'test/net-cookie2', {
|
|
@@ -1872,6 +1872,14 @@ content: <pre>${(await res.getContent())?.toString() ?? 'null'}</pre>`);
|
|
|
1872
1872
|
'ttl': 60,
|
|
1873
1873
|
'httponly': true
|
|
1874
1874
|
});
|
|
1875
|
+
// --- 用于测试 BUG 的额外 Cookie ---
|
|
1876
|
+
this._res.setHeader('Set-Cookie', [
|
|
1877
|
+
...this._res.getHeader('Set-Cookie'),
|
|
1878
|
+
'test-del=; Max-Age=0; Path=/',
|
|
1879
|
+
'test-equals=val=with=equals; Path=/',
|
|
1880
|
+
'test-expires=val; Expires=Wed, 21 Oct 2035 07:28:00 GMT; Path=/',
|
|
1881
|
+
'test-invalid=%invalid; Path=/'
|
|
1882
|
+
]);
|
|
1875
1883
|
return `lCore.setCookie(this, 'test0', 'session');
|
|
1876
1884
|
lCore.setCookie(this, 'test1', 'normal', {
|
|
1877
1885
|
'ttl': 10
|