@nxtedition/scheduler 3.0.0 → 3.0.2

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 export type Priority = -3 | -2 | -1 | 0 | 1 | 2 | 3 | 'lowest' | 'lower' | 'low' | 'normal' | 'high' | 'higher' | 'highest';
-export declare function parsePriority(p: Priority | string | number): number;
+export declare function parsePriority(p: string | number): number;
 export declare class Scheduler {
     #private;
     static LOWEST: Priority;
@@ -16,7 +16,6 @@ export declare class Scheduler {
         pending: number;
         queues: {
             count: number;
-            age: number;
         }[];
     };
     static makeSharedState(concurrency: number): SharedArrayBuffer;

package/lib/index.js

@@ -3,16 +3,10 @@ const CONCURRENCY_INDEX = 1
 
 const maxInt = 2147483647
 
-let fastNow = Date.now()
-setInterval(() => {
-  fastNow = Date.now()
-}, 1e3).unref()
-
 class FastQueue {
   idx = 0
   cnt = 0
-  arr                        = []
-  age = fastNow
+  arr                 = []
 }
 
                       
@@ -31,7 +25,7 @@ class FastQueue {
             
              
 
-export function parsePriority(p                            )         {
+export function parsePriority(p                 )         {
   if (typeof p === 'number') {
     // Do nothing...
   } else if (p === 'lowest') {
@@ -52,7 +46,7 @@ export function parsePriority(p                            )         {
     p = Number(p)
   }
 
-  if (typeof p !== 'number') {
+  if (typeof p !== 'number' || Number.isNaN(p)) {
     return 0
   } else if (p < -3) {
     return -3
@@ -100,7 +94,7 @@ export class Scheduler {
       deferred: this.#deferred,
       running: this.#running,
       pending: this.#pending,
-      queues: this.#queues.map((q) => ({ count: q.cnt, age: q.age })),
+      queues: this.#queues.map((q) => ({ count: q.cnt })),
     }
   }
 
@@ -134,6 +128,7 @@ export class Scheduler {
           try {
             resolve(await fn(o))
           } catch (err) {
+            // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
             reject(err)
           } finally {
             this.release()
@@ -146,7 +141,7 @@ export class Scheduler {
   }
 
   acquire   (fn                         , priority           = Scheduler.NORMAL, opaque    )       {
-    const p = parsePriority(priority)          
+    const p = parsePriority(priority)
     const queue = this.#queues[p + 3]
 
     if (this.#stateView) {
@@ -156,7 +151,7 @@ export class Scheduler {
         fn(opaque)
         return
       }
-    } else if (this.#running < 1 || this.#running < this.#concurrency) {
+    } else if ((this.#running < 1 && this.#concurrency > 0) || this.#running < this.#concurrency) {
       this.#running += 1
       fn(opaque)
       return
@@ -165,10 +160,6 @@ export class Scheduler {
     queue.arr.push(fn, opaque)
     queue.cnt += 1
 
-    if (queue.cnt === 1) {
-      queue.age = fastNow
-    }
-
     this.#deferred += 1
     this.#pending += 1
   }
@@ -185,31 +176,36 @@ export class Scheduler {
 
     try {
       this.#releasing = true
-      while (this.#pending > 0) {
+      while (this.#pending > 0 && (this.#running === 0 || running < this.#concurrency)) {
         let queue                   = null
 
-        // Avoid starvation by randomizing the starting queue.
+        let idx = this.#queues.length - 1
 
-        let idx = 6 // highest: 50%
-        if (this.#counter & 0b0000010) {
-          idx = 5 // higher: 25%
-        } else if (this.#counter & 0b0000100) {
-          idx = 4 // high: 12.5%
-        } else if (this.#counter & 0b0001000) {
-          idx = 3 // normal: 6.25%
-        } else if (this.#counter & 0b0010000) {
-          idx = 2 // low: 3.125%
-        } else if (this.#counter & 0b0100000) {
-          idx = 1 // lower: 1.5625%
-        } else if (this.#counter & 0b1000000) {
-          idx = 0 // lowest: 0.78%
+        // Avoid starvation by randomizing the starting queue.
+        {
+          this.#counter = (this.#counter + 1) & maxInt
+          if (this.#counter & 0b0000001) {
+            idx = 6 // highest: 50%
+          } else if (this.#counter & 0b0000010) {
+            idx = 5 // higher: 25%
+          } else if (this.#counter & 0b0000100) {
+            idx = 4 // high: 12.5%
+          } else if (this.#counter & 0b0001000) {
+            idx = 3 // normal: 6.25%
+          } else if (this.#counter & 0b0010000) {
+            idx = 2 // low: 3.125%
+          } else if (this.#counter & 0b0100000) {
+            idx = 1 // lower: 1.5625%
+          } else if (this.#counter & 0b1000000) {
+            idx = 0 // lowest: 0.78%
+          }
         }
 
         for (let n = idx; n >= 0 && (queue == null || queue.cnt === 0); n--) {
           queue = this.#queues[n]
         }
 
-        for (let n = 6; n > idx && (queue == null || queue.cnt === 0); n--) {
+        for (let n = this.#queues.length - 1; n > idx && (queue == null || queue.cnt === 0); n--) {
           queue = this.#queues[n]
         }
 
@@ -217,23 +213,16 @@ export class Scheduler {
           throw new Error('Invariant violation: pending > 0 but no tasks in queues')
         }
 
-        if (this.#running > 0 && running >= this.#concurrency) {
-          break
-        }
-
-        this.#counter = (this.#counter + 1) & maxInt
-
-        const fn = queue.arr[queue.idx++]
+        const fn = queue.arr[queue.idx++]                                 
         const opaque = queue.arr[queue.idx++]
         queue.cnt -= 1
-        queue.age = fastNow
 
         if (queue.cnt === 0) {
           queue.idx = 0
           queue.arr.length = 0
         } else if (queue.idx > 1024) {
-          queue.arr.splice(0, queue.idx)
           queue.idx = 0
+          queue.arr.splice(0, queue.idx)
         }
 
         running = this.#stateView

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/scheduler",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,6 +19,5 @@
     "amaroc": "^1.0.1",
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3"
-  },
-  "gitHead": "dc18f1fb0cf53929205b2de3cb53c08b631a4a9d"
+  }
 }