@nxtedition/scheduler 1.0.3 → 1.0.5

package/lib/index.d.ts

@@ -4,10 +4,9 @@ export declare class Scheduler {
     static NORMAL: 1;
     static HIGH: 2;
     get concurrency(): number;
-    static makeState(concurrency?: number): SharedArrayBuffer;
-    constructor({ concurrency, stateBuffer }?: {
-        concurrency?: number | undefined;
-        stateBuffer?: SharedArrayBuffer | undefined;
+    static makeSharedState(concurrency?: number): SharedArrayBuffer;
+    constructor(opts?: SharedArrayBuffer | {
+        concurrency?: number;
     });
     schedule(fn: (next: Function) => any, priority?: 1): any;
 }

package/lib/index.js

@@ -14,6 +14,7 @@ export class Scheduler {
 
   #running = 0
   #pending = 0
+  #counter = 0
 
   #lowQueue = new FixedQueue()
   #normalQueue = new FixedQueue()
@@ -23,7 +24,7 @@ export class Scheduler {
     return this.#concurrency
   }
 
-  static makeState(concurrency         = 0) {
+  static makeSharedState(concurrency         = 0) {
     if (concurrency < 0 || !Number.isInteger(concurrency)) {
       throw new Error('Invalid concurrency')
     }
@@ -33,11 +34,13 @@ export class Scheduler {
     return stateBuffer
   }
 
-  constructor({ concurrency = Infinity, stateBuffer = Scheduler.makeState(concurrency) } = {}) {
-    this.#stateView = new Uint32Array(stateBuffer)
-    this.#concurrency =
-      concurrency ??
-      (Atomics.load(new Uint32Array(stateBuffer), Scheduler.#CONCURRENCY_INDEX) || Infinity)
+  constructor(opts                                               = {}) {
+    if (opts instanceof SharedArrayBuffer) {
+      this.#stateView = new Uint32Array(opts)
+      this.#concurrency = Atomics.load(this.#stateView, Scheduler.#CONCURRENCY_INDEX)
+    } else {
+      this.#concurrency = opts?.concurrency ?? 0
+    }
   }
 
   schedule(fn                         , priority = Scheduler.NORMAL) {
@@ -53,11 +56,14 @@ export class Scheduler {
       throw new Error('Invalid priority')
     }
 
-    if (
-      this.#running > 1 &&
-      Atomics.load(this.#stateView, Scheduler.#RUNNING_INDEX) < this.#concurrency
-    ) {
-      Atomics.add(this.#stateView, Scheduler.#RUNNING_INDEX, 1)
+    const running = this.#stateView
+      ? Atomics.load(this.#stateView, Scheduler.#RUNNING_INDEX)
+      : this.#running
+
+    if (this.#running < 1 || running < this.#concurrency) {
+      if (this.#stateView) {
+        Atomics.add(this.#stateView, Scheduler.#RUNNING_INDEX, 1)
+      }
       this.#running += 1
       return fn(this.#next)
     }
@@ -73,15 +79,15 @@ export class Scheduler {
   }
 
   #next = () => {
-    Atomics.sub(this.#stateView, Scheduler.#RUNNING_INDEX, 1)
+    let running = this.#stateView
+      ? Atomics.sub(this.#stateView, Scheduler.#RUNNING_INDEX, 1) - 1
+      : this.#running - 1
     this.#running -= 1
 
-    while (
-      this.#pending > 0 &&
-      (this.#running < 1 ||
-        Atomics.load(this.#stateView, Scheduler.#RUNNING_INDEX) < this.#concurrency)
-    ) {
-      const counter = Atomics.add(this.#stateView, Scheduler.#COUNTER_INDEX, 1)
+    while (this.#pending > 0 && (this.#running < 1 || running < this.#concurrency)) {
+      const counter = this.#stateView
+        ? Atomics.add(this.#stateView, Scheduler.#COUNTER_INDEX, 1)
+        : this.#counter++
       const fn =
         ((counter & 63) === 0 && this.#lowQueue.shift()) ??
         ((counter & 15) === 0 && this.#normalQueue.shift()) ??
@@ -93,7 +99,9 @@ export class Scheduler {
         break
       }
 
-      Atomics.add(this.#stateView, Scheduler.#RUNNING_INDEX, 1)
+      running = this.#stateView
+        ? Atomics.add(this.#stateView, Scheduler.#RUNNING_INDEX, 1) + 1
+        : this.#running + 1
       this.#running += 1
       this.#pending -= 1
       fn(this.#next)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/scheduler",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,5 +20,5 @@
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3"
   },
-  "gitHead": "68ef78988067239d47c2d01df4e54feaedf0afa1"
+  "gitHead": "8317f7c58c48ff5a16b3380f3b9f4c87c56e8500"
 }