await-num-q 1.1.4 → 1.2.1
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/index.d.ts +3 -5
- package/dist/index.js +19 -21
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
export type RunFunBoj = {
|
|
2
2
|
status: "wait" | "ing" | "end" | "fail";
|
|
3
3
|
target: Function;
|
|
4
|
+
retry: number;
|
|
4
5
|
callback?: Function;
|
|
5
6
|
err?: Function;
|
|
6
7
|
};
|
|
7
8
|
export declare class asyncQueue {
|
|
8
9
|
#private;
|
|
9
|
-
constructor(max?: number);
|
|
10
|
+
constructor(max?: number, retry?: number);
|
|
10
11
|
/**
|
|
11
12
|
* 添加任务
|
|
12
13
|
* @param f 目标函数
|
|
@@ -18,7 +19,7 @@ export declare class asyncQueue {
|
|
|
18
19
|
/**
|
|
19
20
|
* 清除运行完成的任务
|
|
20
21
|
*/
|
|
21
|
-
clear(): void;
|
|
22
|
+
clear(fial?: boolean): void;
|
|
22
23
|
/**
|
|
23
24
|
* 添加并运行任务 若是没有传入函数 运行 之前传入的任务
|
|
24
25
|
* @param f 目标函数
|
|
@@ -32,9 +33,6 @@ export declare class asyncQueue {
|
|
|
32
33
|
* @returns
|
|
33
34
|
*/
|
|
34
35
|
getTasks(): RunFunBoj[];
|
|
35
|
-
/**
|
|
36
|
-
*
|
|
37
|
-
*/
|
|
38
36
|
/**
|
|
39
37
|
* 异步运行并得到返回值
|
|
40
38
|
* @param fun 目标函数
|
package/dist/index.js
CHANGED
|
@@ -19,17 +19,21 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
19
19
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
20
20
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
21
21
|
};
|
|
22
|
-
var _asyncQueue_Queue, _asyncQueue_runNum, _asyncQueue_maxNum;
|
|
22
|
+
var _asyncQueue_Queue, _asyncQueue_runNum, _asyncQueue_retry, _asyncQueue_maxNum;
|
|
23
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
24
|
exports.MergeAsync = exports.asyncQueue = void 0;
|
|
25
25
|
class asyncQueue {
|
|
26
|
-
constructor(max) {
|
|
26
|
+
constructor(max, retry) {
|
|
27
27
|
_asyncQueue_Queue.set(this, []);
|
|
28
28
|
_asyncQueue_runNum.set(this, 0);
|
|
29
|
+
_asyncQueue_retry.set(this, 0);
|
|
29
30
|
_asyncQueue_maxNum.set(this, 3);
|
|
30
31
|
if (max) {
|
|
31
32
|
__classPrivateFieldSet(this, _asyncQueue_maxNum, max, "f");
|
|
32
33
|
}
|
|
34
|
+
if (retry) {
|
|
35
|
+
__classPrivateFieldSet(this, _asyncQueue_retry, retry, "f");
|
|
36
|
+
}
|
|
33
37
|
}
|
|
34
38
|
/**
|
|
35
39
|
* 添加任务
|
|
@@ -45,6 +49,7 @@ class asyncQueue {
|
|
|
45
49
|
let funObj = {
|
|
46
50
|
status: "wait",
|
|
47
51
|
target: f,
|
|
52
|
+
retry: __classPrivateFieldGet(this, _asyncQueue_retry, "f"),
|
|
48
53
|
callback,
|
|
49
54
|
err,
|
|
50
55
|
};
|
|
@@ -55,8 +60,8 @@ class asyncQueue {
|
|
|
55
60
|
/**
|
|
56
61
|
* 清除运行完成的任务
|
|
57
62
|
*/
|
|
58
|
-
clear() {
|
|
59
|
-
__classPrivateFieldSet(this, _asyncQueue_Queue, __classPrivateFieldGet(this, _asyncQueue_Queue, "f").filter((item) => item.status !== "end" && item.status !== "fail"), "f");
|
|
63
|
+
clear(fial = false) {
|
|
64
|
+
__classPrivateFieldSet(this, _asyncQueue_Queue, __classPrivateFieldGet(this, _asyncQueue_Queue, "f").filter((item) => item.status !== "end" && fial ? item.status !== "fail" : true), "f");
|
|
60
65
|
}
|
|
61
66
|
/**
|
|
62
67
|
* 添加并运行任务 若是没有传入函数 运行 之前传入的任务
|
|
@@ -94,9 +99,15 @@ class asyncQueue {
|
|
|
94
99
|
}
|
|
95
100
|
catch (_c) {
|
|
96
101
|
if (fun.err instanceof Function) {
|
|
97
|
-
fun.
|
|
102
|
+
if (fun.retry > 0) {
|
|
103
|
+
fun.status = "wait";
|
|
104
|
+
fun.retry--;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
fun.err(data);
|
|
108
|
+
fun.status = "fail";
|
|
109
|
+
}
|
|
98
110
|
}
|
|
99
|
-
fun.status = "fail";
|
|
100
111
|
}
|
|
101
112
|
finally {
|
|
102
113
|
__classPrivateFieldSet(this, _asyncQueue_runNum, (_b = __classPrivateFieldGet(this, _asyncQueue_runNum, "f"), _b--, _b), "f");
|
|
@@ -112,19 +123,6 @@ class asyncQueue {
|
|
|
112
123
|
getTasks() {
|
|
113
124
|
return __classPrivateFieldGet(this, _asyncQueue_Queue, "f");
|
|
114
125
|
}
|
|
115
|
-
/**
|
|
116
|
-
*
|
|
117
|
-
*/
|
|
118
|
-
// runFail(){
|
|
119
|
-
// let fun
|
|
120
|
-
// for (let f of this.#Queue) {
|
|
121
|
-
// if (f.status == 'fail') {
|
|
122
|
-
// fun = f;
|
|
123
|
-
// break;
|
|
124
|
-
// }
|
|
125
|
-
// }
|
|
126
|
-
// fun?.status == 'wait'
|
|
127
|
-
// }
|
|
128
126
|
/**
|
|
129
127
|
* 异步运行并得到返回值
|
|
130
128
|
* @param fun 目标函数
|
|
@@ -139,7 +137,7 @@ class asyncQueue {
|
|
|
139
137
|
}
|
|
140
138
|
}
|
|
141
139
|
exports.asyncQueue = asyncQueue;
|
|
142
|
-
_asyncQueue_Queue = new WeakMap(), _asyncQueue_runNum = new WeakMap(), _asyncQueue_maxNum = new WeakMap();
|
|
140
|
+
_asyncQueue_Queue = new WeakMap(), _asyncQueue_runNum = new WeakMap(), _asyncQueue_retry = new WeakMap(), _asyncQueue_maxNum = new WeakMap();
|
|
143
141
|
const mergePromise = new WeakMap();
|
|
144
142
|
/**
|
|
145
143
|
* 在某个异步请求 参数相同 返回的值相同
|
|
@@ -162,4 +160,4 @@ function MergeAsync(asyncFun, ...param) {
|
|
|
162
160
|
});
|
|
163
161
|
}
|
|
164
162
|
exports.MergeAsync = MergeAsync;
|
|
165
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
163
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBT0EsTUFBYSxVQUFVO0lBS3JCLFlBQVksR0FBWSxFQUFFLEtBQWM7UUFKeEMsNEJBQXNCLEVBQUUsRUFBQztRQUN6Qiw2QkFBVSxDQUFDLEVBQUM7UUFDWiw0QkFBUyxDQUFDLEVBQUM7UUFDWCw2QkFBVSxDQUFDLEVBQUM7UUFFVixJQUFJLEdBQUcsRUFBRSxDQUFDO1lBQ1IsdUJBQUEsSUFBSSxzQkFBVyxHQUFHLE1BQUEsQ0FBQztRQUNyQixDQUFDO1FBQ0QsSUFBSSxLQUFLLEVBQUUsQ0FBQztZQUNWLHVCQUFBLElBQUkscUJBQVUsS0FBSyxNQUFBLENBQUM7UUFDdEIsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxJQUFJLENBQUMsQ0FBVyxFQUFFLFFBQW1CLEVBQUUsR0FBYztRQUNuRCxJQUFJLENBQUMsQ0FBQyxXQUFXLENBQUMsSUFBSSxLQUFLLGVBQWUsRUFBRSxDQUFDO1lBQzNDLE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQztRQUNELElBQUksTUFBTSxHQUFjO1lBQ3RCLE1BQU0sRUFBRSxNQUFNO1lBQ2QsTUFBTSxFQUFFLENBQUM7WUFDVCxLQUFLLEVBQUUsdUJBQUEsSUFBSSx5QkFBTztZQUNsQixRQUFRO1lBQ1IsR0FBRztTQUNKLENBQUM7UUFDRix1QkFBQSxJQUFJLHlCQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNiLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVEOztPQUVHO0lBQ0gsS0FBSyxDQUFDLElBQUksR0FBRyxLQUFLO1FBQ2hCLHVCQUFBLElBQUkscUJBQVUsdUJBQUEsSUFBSSx5QkFBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxF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
|