@nxtedition/scheduler 3.0.0 → 3.0.1

package/lib/index.js

@@ -52,7 +52,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
@@ -156,7 +156,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
@@ -185,31 +185,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,12 +222,6 @@ 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 opaque = queue.arr[queue.idx++]
         queue.cnt -= 1
@@ -232,8 +231,8 @@ export class Scheduler {
           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.1",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,5 +20,5 @@
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3"
   },
-  "gitHead": "dc18f1fb0cf53929205b2de3cb53c08b631a4a9d"
+  "gitHead": "c88bafd0c4a7e250d9e4080d9f50a0a0a1a562ac"
 }