@nxtedition/lib 23.17.17 → 23.17.19

package/app.js

@@ -38,7 +38,6 @@ import { isTimeBetween } from './time.js'
 import makeUnderPressure from './under-pressure.js'
 import undici from '@nxtedition/undici'
 import { isPrimary } from 'node:cluster'
-import { doYield } from './yield.js'
 
 export function makeApp(appConfig, onTerminate) {
   let ds
@@ -398,7 +397,7 @@ export function makeApp(appConfig, onTerminate) {
         {
           userAgent,
           url: isProduction ? 'ws://deepstream:6020/deepstream' : 'ws://127.0.0.1:6020/deepstream',
-          schedule: (fn) => doYield(fn),
+          schedule: (fn) => setImmediate(fn),
         },
         appConfig.deepstream,
         config.deepstream,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.17.17",
+  "version": "23.17.19",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/yield.js

@@ -1,8 +1,7 @@
-import { FixedQueue } from './fixed-queue.js'
-
 const yieldSchedule = globalThis.setImmediate ?? ((fn) => setTimeout(fn, 0))
+const yieldQueue = []
 
-let yieldQueue = new FixedQueue()
+let yieldIndex = 0
 let yieldTimeout = 40
 let yieldActive = false
 let yieldScheduled = false
@@ -22,23 +21,23 @@ export function shouldYield() {
   return yieldActive
 }
 
-export function maybeYield(callback) {
+export function maybeYield(callback, opaque) {
   if (callback != null && typeof callback !== 'function') {
     throw new TypeError('callback must be a function')
   }
 
   if (shouldYield()) {
-    return doYield(callback)
+    return doYield(callback, opaque)
   }
 
   if (callback != null) {
-    callback(null)
+    callback(null, opaque)
   }
 
   return null
 }
 
-export function doYield(callback) {
+export function doYield(callback, opaque) {
   if (callback != null && typeof callback !== 'function') {
     throw new TypeError('callback must be a function')
   }
@@ -49,12 +48,12 @@ export function doYield(callback) {
   }
 
   if (callback != null) {
-    yieldQueue.push(callback)
+    yieldQueue.push(callback, opaque)
     return null
   }
 
   return new Promise((resolve) => {
-    yieldQueue.push(resolve)
+    yieldQueue.push(resolve, opaque)
   })
 }
 
@@ -62,23 +61,33 @@ function dispatchYield() {
   yieldTime = performance.now()
   yieldActive = false
 
-  const queue = yieldQueue
-  yieldQueue = new FixedQueue()
+  const maxIndex = yieldQueue.length
+
+  while (yieldIndex < maxIndex) {
+    const resolve = yieldQueue[yieldIndex]
+    yieldQueue[yieldIndex] = null
+    yieldIndex += 1
 
-  while (!queue.isEmpty()) {
-    const resolve = queue.shift()
+    const opaque = yieldQueue[yieldIndex]
+    yieldQueue[yieldIndex] = null
+    yieldIndex += 1
 
-    resolve(null)
+    resolve(opaque)
 
     if (shouldYield()) {
-      yieldSchedule(dispatchYield)
-      return
+      break
     }
   }
 
-  if (yieldQueue.isEmpty()) {
+  if (yieldIndex === yieldQueue.length) {
     yieldScheduled = false
+    yieldQueue.splice(0)
+    yieldIndex = 0
   } else {
+    if (yieldIndex > 16 * 1024) {
+      yieldQueue.splice(0, yieldIndex)
+      yieldIndex = 0
+    }
     yieldSchedule(dispatchYield)
   }
 }