@nxtedition/scheduler 2.0.2 → 2.0.4

package/lib/index.d.ts

@@ -19,6 +19,7 @@ export declare class Scheduler {
     constructor(opts: SharedArrayBuffer | {
         concurrency?: number;
     });
-    acquire(fn: (opaque?: any) => any, priority?: 0 | 1 | 2 | 'low' | 'normal' | 'high', opaque?: any): any;
+    run<T, U>(fn: (opaque?: U) => Promise<T> | T, priority?: 0 | 1 | 2 | 'low' | 'normal' | 'high', opaque?: U): Promise<T>;
+    acquire<U>(fn: (opaque?: U) => unknown, priority?: 0 | 1 | 2 | 'low' | 'normal' | 'high', opaque?: U): void;
     release(): void;
 }

package/lib/index.js

@@ -67,11 +67,33 @@ export class Scheduler {
     this.#highQueue.lim = this.#concurrency
   }
 
-  acquire(
-    fn                       ,
+  run      (
+    fn                                ,
     priority                                        = Scheduler.NORMAL,
-    opaque      ,
-  ) {
+    opaque    ,
+  )             {
+    return new Promise   ((resolve, reject) => {
+      this.acquire(
+        async (o) => {
+          try {
+            resolve(await fn(o))
+          } catch (err) {
+            reject(err)
+          } finally {
+            this.release()
+          }
+        },
+        priority,
+        opaque,
+      )
+    })
+  }
+
+  acquire   (
+    fn                         ,
+    priority                                        = Scheduler.NORMAL,
+    opaque    ,
+  )       {
     if (typeof priority === 'number' && Number.isInteger(priority) && priority >= 0) {
       // Do nothing
     } else if (priority == null) {
@@ -103,11 +125,13 @@ export class Scheduler {
       if (this.#running < 1 || this.#stateView[RUNNING_INDEX] < queue.lim) {
         Atomics.add(this.#stateView, RUNNING_INDEX, 1)
         this.#running += 1
-        return fn(opaque)
+        fn(opaque)
+        return
       }
     } else if (this.#running < 1 || this.#running < queue.lim) {
       this.#running += 1
-      return fn(opaque)
+      fn(opaque)
+      return
     }
 
     queue.arr.push(fn, opaque)
@@ -145,9 +169,9 @@ export class Scheduler {
           break
         }
 
-        if ((this.#counter & 63) === 0) {
+        if ((this.#counter & 63) === 0 && this.#lowQueue.cnt > 0) {
           queue = this.#lowQueue
-        } else if ((this.#counter & 15) === 0) {
+        } else if ((this.#counter & 15) === 0 && this.#normalQueue.cnt > 0) {
           queue = this.#normalQueue
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/scheduler",
-  "version": "2.0.2",
+  "version": "2.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": "ee95b62bb1f5bc494fa4fcff603f5a44b44723ac"
+  "gitHead": "aa8978d5b536477418eb6cc60255d4a36bb9d013"
 }