@nxtedition/scheduler 3.0.5 → 3.0.8

package/lib/index.js

@@ -103,17 +103,20 @@ export class Scheduler {
       throw new Error('Invalid concurrency')
     }
     const stateBuffer = new SharedArrayBuffer(64)
-    const stateView = new Uint32Array(stateBuffer)
-    Atomics.store(stateView, CONCURRENCY_INDEX, concurrency ?? 0)
+    const stateView = new Int32Array(stateBuffer)
+    Atomics.store(stateView, CONCURRENCY_INDEX, concurrency ?? -1)
     return stateBuffer
   }
 
   constructor(opts                                              ) {
     if (opts instanceof SharedArrayBuffer) {
-      this.#stateView = new Uint32Array(opts)
-      this.#concurrency = Atomics.load(this.#stateView, CONCURRENCY_INDEX) || Infinity
+      this.#stateView = new Int32Array(opts)
+      this.#concurrency = Atomics.load(this.#stateView, CONCURRENCY_INDEX)
+      if (this.#concurrency === -1) {
+        this.#concurrency = Infinity
+      }
     } else {
-      this.#concurrency = opts?.concurrency || Infinity
+      this.#concurrency = opts?.concurrency ?? Infinity
     }
   }
 
@@ -153,9 +156,9 @@ export class Scheduler {
         return
       }
 
-      if (Atomics.add(this.#stateView, RUNNING_INDEX, 1) >= this.#concurrency) {
-        Atomics.sub(this.#stateView, RUNNING_INDEX, 1)
-      } else {
+      // We use non atomic access here as an optimization and treat the concurrency limit as a soft limit.
+      if (this.#stateView[RUNNING_INDEX] < this.#concurrency) {
+        Atomics.add(this.#stateView, RUNNING_INDEX, 1)
         this.#running += 1
         fn(opaque)
         return
@@ -174,10 +177,16 @@ export class Scheduler {
   }
 
   release() {
-    let running = this.#stateView
-      ? Atomics.sub(this.#stateView, RUNNING_INDEX, 1) - 1
-      : this.#running - 1
-    this.#running -= 1
+    let running        
+    if (this.#running > 0) {
+      running = this.#stateView
+        ? Atomics.sub(this.#stateView, RUNNING_INDEX, 1) - 1
+        : this.#running - 1
+      this.#running -= 1
+    } else {
+      // Gracefully handle user error...
+      running = this.#stateView ? Atomics.load(this.#stateView, RUNNING_INDEX) : this.#running
+    }
 
     if (this.#pending === 0 || this.#releasing) {
       return
@@ -222,33 +231,39 @@ export class Scheduler {
           throw new Error('Invariant violation: pending > 0 but no tasks in queues')
         }
 
-        const fn = queue.arr[queue.idx++]                                 
-        const opaque = queue.arr[queue.idx++]
+        const fn = queue.arr[queue.idx]                                 
+        queue.arr[queue.idx++] = null
+        const opaque = queue.arr[queue.idx]
+        queue.arr[queue.idx++] = null
         queue.cnt -= 1
 
         if (queue.cnt === 0) {
           queue.idx = 0
           queue.arr.length = 0
         } else if (queue.idx > 1024) {
-          queue.idx = 0
           queue.arr.splice(0, queue.idx)
+          queue.idx = 0
         }
 
-        running = this.#stateView
-          ? Atomics.add(this.#stateView, RUNNING_INDEX, 1) + 1
-          : this.#running + 1
-
-        this.#counter += 1
         this.#pending -= 1
         this.#running += 1
+
+        if (this.#stateView) {
+          Atomics.add(this.#stateView, RUNNING_INDEX, 1)
+        }
+
         fn(opaque)
+
+        // Re-read running after fn() in case it synchronously called release()
+        running = this.#stateView ? Atomics.load(this.#stateView, RUNNING_INDEX) : this.#running
       }
-      this.#releasing = false
     } catch (err) {
       // Throwing here is undefined behavior...
       queueMicrotask(() => {
         throw new Error('Scheduler task error', { cause: err })
       })
+    } finally {
+      this.#releasing = false
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/scheduler",
-  "version": "3.0.5",
+  "version": "3.0.8",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,7 +18,8 @@
     "prepublishOnly": "yarn build",
     "typecheck": "tsc --noEmit",
     "test": "yarn build && node --test",
-    "test:ci": "yarn build && node --test"
+    "test:ci": "yarn build && node --test",
+    "test:coverage": "npx tsx --test --experimental-test-coverage src/index.test.ts"
   },
   "devDependencies": {
     "@types/node": "^25.2.3",
@@ -27,5 +28,5 @@
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3"
   },
-  "gitHead": "6174bfadecfd6232d4fd5c526fecf17d24528ff3"
+  "gitHead": "12c38fec15bd155797cb1edae372a81061715df3"
 }