@nxtedition/scheduler 3.1.2 → 3.1.4
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/lib/scheduler.d.ts +5 -4
- package/lib/scheduler.d.ts.map +1 -1
- package/lib/scheduler.js +20 -14
- package/lib/scheduler.js.map +1 -1
- package/lib/throttle.d.ts +2 -0
- package/lib/throttle.d.ts.map +1 -1
- package/lib/throttle.js +34 -24
- package/lib/throttle.js.map +1 -1
- package/package.json +2 -3
package/lib/scheduler.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Queue, type Priority } from './queue.ts';
|
|
2
2
|
export declare class Scheduler extends Queue {
|
|
3
|
-
run<T>(fn: () =>
|
|
4
|
-
run<T, U>(fn: (opaque: U) =>
|
|
5
|
-
acquire(fn: () => unknown, priority?: Priority):
|
|
6
|
-
acquire<U>(fn: (opaque: U) => unknown, priority: Priority, opaque: U):
|
|
3
|
+
run<T>(fn: () => PromiseLike<T> | T, priority?: Priority): Promise<T>;
|
|
4
|
+
run<T, U>(fn: (opaque: U) => PromiseLike<T> | T, priority: Priority, opaque: U): Promise<T>;
|
|
5
|
+
acquire(fn: () => unknown, priority?: Priority): boolean;
|
|
6
|
+
acquire<U>(fn: (opaque: U) => unknown, priority: Priority, opaque: U): boolean;
|
|
7
|
+
tryAcquire(): boolean;
|
|
7
8
|
release: () => void;
|
|
8
9
|
get stats(): {
|
|
9
10
|
deferred: number;
|
package/lib/scheduler.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../src/scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAA;AAI3E,qBAAa,SAAU,SAAQ,KAAK;IAClC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../src/scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAA;AAI3E,qBAAa,SAAU,SAAQ,KAAK;IAClC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC;IACrE,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IA4B3F,OAAO,CAAC,EAAE,EAAE,MAAM,OAAO,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO;IACxD,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO;IAoC9E,UAAU,IAAI,OAAO;IAerB,OAAO,aAoDN;IAED,IAAI,KAAK;;;;;;;MAOR;CACF"}
|
package/lib/scheduler.js
CHANGED
|
@@ -7,8 +7,7 @@ export class Scheduler extends Queue {
|
|
|
7
7
|
try {
|
|
8
8
|
const result = fn(o);
|
|
9
9
|
if (result && typeof result.then === 'function') {
|
|
10
|
-
;
|
|
11
|
-
result.then(resolve, reject).then(this.release);
|
|
10
|
+
void result.then(resolve, reject).then(this.release);
|
|
12
11
|
}
|
|
13
12
|
else {
|
|
14
13
|
resolve(result);
|
|
@@ -31,33 +30,46 @@ export class Scheduler extends Queue {
|
|
|
31
30
|
Atomics.add(this.stateView, RUNNING_INDEX, 1);
|
|
32
31
|
this.running += 1;
|
|
33
32
|
fn(opaque);
|
|
34
|
-
return;
|
|
33
|
+
return true;
|
|
35
34
|
}
|
|
36
35
|
// We use non atomic access here as an optimization and treat the concurrency limit as a soft limit.
|
|
37
36
|
if (this.stateView[RUNNING_INDEX] < this.concurrency) {
|
|
38
37
|
Atomics.add(this.stateView, RUNNING_INDEX, 1);
|
|
39
38
|
this.running += 1;
|
|
40
39
|
fn(opaque);
|
|
41
|
-
return;
|
|
40
|
+
return true;
|
|
42
41
|
}
|
|
43
42
|
}
|
|
44
43
|
else if (this.running < this.concurrency) {
|
|
45
44
|
this.running += 1;
|
|
46
45
|
fn(opaque);
|
|
47
|
-
return;
|
|
46
|
+
return true;
|
|
48
47
|
}
|
|
49
48
|
queue.arr.push(fn, opaque);
|
|
50
49
|
queue.cnt += 1;
|
|
51
50
|
this.deferred += 1;
|
|
52
51
|
this.pending += 1;
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
tryAcquire() {
|
|
55
|
+
if (this.stateView) {
|
|
56
|
+
if (this.running < 1 || this.stateView[RUNNING_INDEX] < this.concurrency) {
|
|
57
|
+
Atomics.add(this.stateView, RUNNING_INDEX, 1);
|
|
58
|
+
this.running += 1;
|
|
59
|
+
return true;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
else if (this.running < this.concurrency) {
|
|
63
|
+
this.running += 1;
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
66
|
+
return false;
|
|
53
67
|
}
|
|
54
68
|
release = () => {
|
|
55
69
|
let running;
|
|
56
70
|
if (this.running > 0) {
|
|
57
|
-
running = this.stateView
|
|
58
|
-
? Atomics.sub(this.stateView, RUNNING_INDEX, 1) - 1
|
|
59
|
-
: this.running - 1;
|
|
60
71
|
this.running -= 1;
|
|
72
|
+
running = this.stateView ? Atomics.sub(this.stateView, RUNNING_INDEX, 1) - 1 : this.running;
|
|
61
73
|
}
|
|
62
74
|
else {
|
|
63
75
|
// Gracefully handle user error...
|
|
@@ -96,12 +108,6 @@ export class Scheduler extends Queue {
|
|
|
96
108
|
running = this.stateView ? Atomics.load(this.stateView, RUNNING_INDEX) : this.running;
|
|
97
109
|
}
|
|
98
110
|
}
|
|
99
|
-
catch (err) {
|
|
100
|
-
// Throwing here is undefined behavior...
|
|
101
|
-
queueMicrotask(() => {
|
|
102
|
-
throw new Error('Scheduler task error', { cause: err });
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
111
|
finally {
|
|
106
112
|
this.releasing = false;
|
|
107
113
|
}
|
package/lib/scheduler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../src/scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAiB,MAAM,YAAY,CAAA;AAE3E,MAAM,aAAa,GAAG,CAAC,CAAA;AAEvB,MAAM,OAAO,SAAU,SAAQ,KAAK;IAGlC,GAAG,CACD,
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../src/scheduler.ts"],"names":[],"mappings":"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"}
|
package/lib/throttle.d.ts
CHANGED
|
@@ -9,6 +9,8 @@ export declare class Throttle extends Queue {
|
|
|
9
9
|
[Symbol.dispose](): void;
|
|
10
10
|
stream(priority?: Priority): Transform;
|
|
11
11
|
acquire(fn: () => unknown, bytes: number, priority?: Priority): boolean;
|
|
12
|
+
acquire<U>(fn: (opaque: U) => unknown, bytes: number, priority: Priority, opaque: U): boolean;
|
|
13
|
+
tryAcquire(bytes: number): boolean;
|
|
12
14
|
get stats(): {
|
|
13
15
|
tokens: number;
|
|
14
16
|
pending: number;
|
package/lib/throttle.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"throttle.d.ts","sourceRoot":"","sources":["../src/throttle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAA4B,KAAK,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAA;AAK3E,qBAAa,QAAS,SAAQ,KAAK;;gBAOrB,IAAI,EAAE,iBAAiB,GAAG;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE;
|
|
1
|
+
{"version":3,"file":"throttle.d.ts","sourceRoot":"","sources":["../src/throttle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAA4B,KAAK,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAA;AAK3E,qBAAa,QAAS,SAAQ,KAAK;;gBAOrB,IAAI,EAAE,iBAAiB,GAAG;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE;IAQjE,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,MAAM;IAI7C,CAAC,MAAM,CAAC,OAAO,CAAC;IAShB,MAAM,CAAC,QAAQ,GAAE,QAAuB;IAQxC,OAAO,CAAC,EAAE,EAAE,MAAM,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO;IACvE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO;IA4B7F,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAQlC,IAAI,KAAK;;;;;;MAMR;CAqFF"}
|
package/lib/throttle.js
CHANGED
|
@@ -10,8 +10,10 @@ export class Throttle extends Queue {
|
|
|
10
10
|
#drainTimer = null;
|
|
11
11
|
constructor(opts) {
|
|
12
12
|
super(opts instanceof SharedArrayBuffer ? opts : { concurrency: opts?.bytesPerSecond });
|
|
13
|
-
this.#refillTimer =
|
|
14
|
-
|
|
13
|
+
this.#refillTimer =
|
|
14
|
+
!this.stateView || isMainThread ? setInterval(() => this.#refill(), 100).unref() : null;
|
|
15
|
+
this.#drainTimer =
|
|
16
|
+
this.stateView && !isMainThread ? setInterval(() => this.#drain(), 100).unref() : null;
|
|
15
17
|
}
|
|
16
18
|
static makeSharedState(bytesPerSecond) {
|
|
17
19
|
return super.makeSharedState(bytesPerSecond);
|
|
@@ -31,31 +33,28 @@ export class Throttle extends Queue {
|
|
|
31
33
|
},
|
|
32
34
|
});
|
|
33
35
|
}
|
|
34
|
-
acquire(fn, bytes, priority = Queue.NORMAL) {
|
|
36
|
+
acquire(fn, bytes, priority = Queue.NORMAL, opaque) {
|
|
35
37
|
if ((!this.stateView || isMainThread) && this.#tokens < bytes) {
|
|
36
38
|
this.#refill();
|
|
37
39
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
if (this.pending === 0 && this.#tokens >= bytes) {
|
|
41
|
-
// Nothing in the queue, and enough tokens to run immediately.
|
|
42
|
-
if (this.stateView) {
|
|
43
|
-
Atomics.sub(this.stateView, TOKENS_INDEX, bytes);
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
this.#singleThreadTokens -= bytes;
|
|
47
|
-
}
|
|
48
|
-
fn();
|
|
40
|
+
if (this.pending === 0 && this.#tryConsumeTokens(bytes)) {
|
|
41
|
+
fn(opaque);
|
|
49
42
|
return true;
|
|
50
43
|
}
|
|
51
44
|
const p = parsePriority(priority);
|
|
52
45
|
const queue = this.queues[p + 3];
|
|
53
46
|
this.pending += 1;
|
|
54
47
|
this.deferred += 1;
|
|
55
|
-
queue.arr.push(fn, bytes);
|
|
48
|
+
queue.arr.push(fn, bytes, opaque);
|
|
56
49
|
queue.cnt += 1;
|
|
57
50
|
return false;
|
|
58
51
|
}
|
|
52
|
+
tryAcquire(bytes) {
|
|
53
|
+
if ((!this.stateView || isMainThread) && this.#tokens < bytes) {
|
|
54
|
+
this.#refill();
|
|
55
|
+
}
|
|
56
|
+
return this.pending === 0 && this.#tryConsumeTokens(bytes);
|
|
57
|
+
}
|
|
59
58
|
get stats() {
|
|
60
59
|
return {
|
|
61
60
|
tokens: this.#tokens,
|
|
@@ -66,6 +65,22 @@ export class Throttle extends Queue {
|
|
|
66
65
|
get #tokens() {
|
|
67
66
|
return this.stateView ? this.stateView[TOKENS_INDEX] : this.#singleThreadTokens;
|
|
68
67
|
}
|
|
68
|
+
#tryConsumeTokens(bytes) {
|
|
69
|
+
// There is a possiblity that this check passes for two threads, but should only have passed for one of them.
|
|
70
|
+
// Given that the concurrency limit is a soft limit, this is not a problem and will just mean that we might
|
|
71
|
+
// briefly exceed the concurrency limit until the next refill.
|
|
72
|
+
if (this.#tokens < bytes) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
// Nothing in the queue, and enough tokens to run immediately.
|
|
76
|
+
if (this.stateView) {
|
|
77
|
+
Atomics.sub(this.stateView, TOKENS_INDEX, bytes);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
this.#singleThreadTokens -= bytes;
|
|
81
|
+
}
|
|
82
|
+
return true;
|
|
83
|
+
}
|
|
69
84
|
#refill() {
|
|
70
85
|
const currentToken = this.#tokens;
|
|
71
86
|
if (currentToken >= this.concurrency) {
|
|
@@ -94,21 +109,16 @@ export class Throttle extends Queue {
|
|
|
94
109
|
break;
|
|
95
110
|
}
|
|
96
111
|
const bytes = queue.arr[queue.idx + 1];
|
|
97
|
-
|
|
98
|
-
if (currentTokens < bytes) {
|
|
112
|
+
if (!this.#tryConsumeTokens(bytes)) {
|
|
99
113
|
this.#drainTimer?.refresh();
|
|
100
114
|
return;
|
|
101
115
|
}
|
|
102
116
|
const fn = queue.arr[queue.idx];
|
|
117
|
+
const opaque = queue.arr[queue.idx + 2];
|
|
118
|
+
queue.arr[queue.idx++] = null;
|
|
103
119
|
queue.arr[queue.idx++] = null;
|
|
104
120
|
queue.arr[queue.idx++] = null;
|
|
105
121
|
queue.cnt -= 1;
|
|
106
|
-
if (this.stateView) {
|
|
107
|
-
Atomics.sub(this.stateView, TOKENS_INDEX, bytes);
|
|
108
|
-
}
|
|
109
|
-
else {
|
|
110
|
-
this.#singleThreadTokens -= bytes;
|
|
111
|
-
}
|
|
112
122
|
this.pending -= 1;
|
|
113
123
|
if (queue.cnt === 0) {
|
|
114
124
|
queue.idx = 0;
|
|
@@ -118,7 +128,7 @@ export class Throttle extends Queue {
|
|
|
118
128
|
queue.arr.splice(0, queue.idx);
|
|
119
129
|
queue.idx = 0;
|
|
120
130
|
}
|
|
121
|
-
fn();
|
|
131
|
+
fn(opaque);
|
|
122
132
|
}
|
|
123
133
|
}
|
|
124
134
|
}
|
package/lib/throttle.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../src/throttle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAiB,MAAM,YAAY,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,MAAM,YAAY,GAAG,CAAC,CAAA;AAEtB,MAAM,OAAO,QAAS,SAAQ,KAAK;IACjC,mBAAmB,GAAG,CAAC,CAAA;IACvB,kFAAkF;IAClF,eAAe,GAAW,CAAC,QAAQ,CAAA;IACnC,YAAY,GAA0B,IAAI,CAAA;IAC1C,WAAW,GAA0B,IAAI,CAAA;IAEzC,YAAY,IAAqD;QAC/D,KAAK,CAAC,IAAI,YAAY,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;QACvF,IAAI,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../src/throttle.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nxtedition/scheduler",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -30,6 +30,5 @@
|
|
|
30
30
|
"oxlint-tsgolint": "^0.13.0",
|
|
31
31
|
"rimraf": "^6.1.3",
|
|
32
32
|
"typescript": "^5.9.3"
|
|
33
|
-
}
|
|
34
|
-
"gitHead": "15cf2221f806675de2c224219a7f11ffc17ffeb3"
|
|
33
|
+
}
|
|
35
34
|
}
|