@nxtedition/scheduler 1.0.2 → 1.0.4

package/lib/index.d.ts

@@ -3,6 +3,7 @@ export declare class Scheduler {
     static LOW: 0;
     static NORMAL: 1;
     static HIGH: 2;
+    get concurrency(): number;
     static makeState(concurrency?: number): SharedArrayBuffer;
     constructor({ concurrency, stateBuffer }?: {
         concurrency?: number | undefined;

package/lib/index.js

@@ -19,7 +19,14 @@ export class Scheduler {
   #normalQueue = new FixedQueue()
   #highQueue = new FixedQueue()
 
+  get concurrency() {
+    return this.#concurrency
+  }
+
   static makeState(concurrency         = 0) {
+    if (concurrency < 0 || !Number.isInteger(concurrency)) {
+      throw new Error('Invalid concurrency')
+    }
     const stateBuffer = new SharedArrayBuffer(64)
     const stateView = new Uint32Array(stateBuffer)
     Atomics.store(stateView, Scheduler.#CONCURRENCY_INDEX, concurrency ?? 0)
@@ -47,7 +54,7 @@ export class Scheduler {
     }
 
     if (
-      this.#running > 1 &&
+      this.#running < 1 ||
       Atomics.load(this.#stateView, Scheduler.#RUNNING_INDEX) < this.#concurrency
     ) {
       Atomics.add(this.#stateView, Scheduler.#RUNNING_INDEX, 1)
@@ -66,14 +73,10 @@ export class Scheduler {
   }
 
   #next = () => {
-    Atomics.sub(this.#stateView, Scheduler.#RUNNING_INDEX, 1)
+    let running = Atomics.sub(this.#stateView, Scheduler.#RUNNING_INDEX, 1) - 1
     this.#running -= 1
 
-    while (
-      this.#pending > 0 &&
-      (this.#running < 1 ||
-        Atomics.load(this.#stateView, Scheduler.#RUNNING_INDEX) < this.#concurrency)
-    ) {
+    while (this.#pending > 0 && (this.#running < 1 || running < this.#concurrency)) {
       const counter = Atomics.add(this.#stateView, Scheduler.#COUNTER_INDEX, 1)
       const fn =
         ((counter & 63) === 0 && this.#lowQueue.shift()) ??
@@ -86,7 +89,7 @@ export class Scheduler {
         break
       }
 
-      Atomics.add(this.#stateView, Scheduler.#RUNNING_INDEX, 1)
+      running = Atomics.add(this.#stateView, Scheduler.#RUNNING_INDEX, 1) + 1
       this.#running += 1
       this.#pending -= 1
       fn(this.#next)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/scheduler",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,5 +20,5 @@
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3"
   },
-  "gitHead": "a8531a2fd6f9e627ebb81eaaf9ea9e4bb8f85145"
+  "gitHead": "5ed8daa54f2d78c2a8be28b306b6144582332093"
 }