@zwa73/utils 1.0.242 → 1.0.244
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/UtilFunctions.js +3 -4
- package/dist/UtilHttp.js +1 -6
- package/package.json +2 -2
package/dist/UtilFunctions.js
CHANGED
|
@@ -125,11 +125,10 @@ class _UtilFunc {
|
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
const key = '__jsUtils';
|
|
128
|
-
const
|
|
129
|
-
exports.UtilFunc = (0, modular_mixer_1.
|
|
130
|
-
base: _UtilFunc,
|
|
128
|
+
const fieldList = Object.getOwnPropertyNames(js_utils_1.JsFunc).filter(k => !['length', 'prototype', 'name'].includes(k));
|
|
129
|
+
exports.UtilFunc = (0, modular_mixer_1.composeClass)(_UtilFunc, {
|
|
131
130
|
mixin: js_utils_1.JsFunc,
|
|
132
|
-
key,
|
|
131
|
+
key, fieldList
|
|
133
132
|
});
|
|
134
133
|
//void (async ()=>{
|
|
135
134
|
// const p1 = UtilFunc.getNeverResolvedPromise();
|
package/dist/UtilHttp.js
CHANGED
|
@@ -382,17 +382,12 @@ class UtilHttp {
|
|
|
382
382
|
static async request(option, sendProc, acceptProc) {
|
|
383
383
|
const { reduce: reqReduce, init: reqInit } = acceptProc;
|
|
384
384
|
const { proc: reqProc } = sendProc;
|
|
385
|
-
const { protocol, timeout = 0,
|
|
386
|
-
//interval = 0,
|
|
387
|
-
...baseReqOpt } = option;
|
|
385
|
+
const { protocol, timeout = 0, ...baseReqOpt } = option;
|
|
388
386
|
const plusTimeout = timeout + 1000;
|
|
389
387
|
const hasTimeLimit = timeout >= 10_000;
|
|
390
388
|
const flagName = `UtilCom.request ${protocol}${baseReqOpt.method} ${UtilFunctions_1.UtilFunc.genUUID()}`;
|
|
391
389
|
const reduceQueue = new js_utils_1.PromiseQueue();
|
|
392
390
|
let dataPromise = null;
|
|
393
|
-
//等待间隔
|
|
394
|
-
//if(UtilHttp.requestQueue.length>0 && interval>0)
|
|
395
|
-
// await UtilHttp.requestQueue.enqueue(async ()=>UtilFunc.sleep(interval));
|
|
396
391
|
return new Promise(async (resolve, rejecte) => {
|
|
397
392
|
const finallyTimeout = hasTimeLimit
|
|
398
393
|
? setTimeout(() => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zwa73/utils",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.244",
|
|
4
4
|
"description": "my utils",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@deepkit/type": "^1.0.1-alpha.153",
|
|
20
20
|
"@zwa73/js-utils": "*",
|
|
21
|
-
"@zwa73/modular-mixer": "
|
|
21
|
+
"@zwa73/modular-mixer": "^1.0.5",
|
|
22
22
|
"form-data": "^4.0.2",
|
|
23
23
|
"glob": "^10.4.1",
|
|
24
24
|
"handlebars": "^4.7.8",
|