@nxtedition/lib 26.0.21 → 26.0.23

package/app.js

@@ -142,17 +142,32 @@ export function makeApp(appConfig, onTerminate) {
     process.title = userAgent
   }
 
-  const dailyOffpeakTime = config.dailyOffpeakTime ?? getUTCRangeForLocalTime('00:00-04:00')
+  const dailyOffpeakTime =
+    config.dailyOffpeakTime ?? (isMainThread ? getUTCRangeForLocalTime('00:00-04:00') : null)
 
   if (dailyOffpeakTime) {
-    // TODO (fix): This is ugly...
+    const offPeakId = (process.pid << 16) | threadId
+    const offPeakBC = new BroadcastChannel('nxt:offPeak').unref()
+
+    let lastOffPeak = 0
+    offPeakBC.onmessage = ({ data }) => {
+      const now = Date.now()
+      logger.debug({ data, elapsedTime: now - lastOffPeak }, 'offpeak')
+      lastOffPeak = now
+    }
 
     const [start, end] = dailyOffpeakTime.split('-')
     let wasOffpeak = null
     setInterval(() => {
       if (isTimeBetween(new Date(), start, end)) {
-        if (!wasOffpeak && global.gc) {
-          global.gc()
+        if (!wasOffpeak) {
+          if (Date.now() - lastOffPeak > 60e3) {
+            offPeakBC.postMessage({ id: offPeakId, value: dailyOffpeakTime })
+          }
+
+          if (typeof global.gc === 'function') {
+            global.gc()
+          }
         }
         wasOffpeak = true
       } else {
@@ -295,8 +310,8 @@ export function makeApp(appConfig, onTerminate) {
     const histogram = monitorEventLoopDelay({ resolution })
     histogram.enable()
 
-    const lagBC = new BroadcastChannel('nxt:lag')
-    lagBC.unref()
+    const lagId = (process.pid << 16) | threadId
+    const lagBC = new BroadcastChannel('nxt:lag').unref()
 
     if (isMainThread && isPrimary) {
       const lagMap = new Map()
@@ -322,7 +337,6 @@ export function makeApp(appConfig, onTerminate) {
       }, 500).unref()
     }
 
-    const lagId = (process.pid << 16) | threadId
     setInterval(() => {
       let currentLag = Math.max(0, histogram.mean / 1e6 - resolution)
       if (Number.isNaN(currentLag)) {
@@ -564,8 +578,7 @@ export function makeApp(appConfig, onTerminate) {
       stats$ = rxjs.timer(0, 10e3).pipe(rx.map(() => ({})))
     }
 
-    const memoryUsageBC = new BroadcastChannel('nxt:memoryUsage')
-    memoryUsageBC.unref()
+    const memoryUsageBC = new BroadcastChannel('nxt:memoryUsage').unref()
 
     let memoryUsageMap
     if (isMainThread) {
@@ -953,8 +966,7 @@ export function makeApp(appConfig, onTerminate) {
   if (appConfig.inspect !== false && !cluster.isWorker) {
     // TODO (fix): What about cluster?
 
-    const inspectBC = new BroadcastChannel('nxt:inspect')
-    inspectBC.unref()
+    const inspectBC = new BroadcastChannel('nxt:inspect').unref()
 
     let inspectOpen = false
 
@@ -1095,8 +1107,7 @@ export function makeApp(appConfig, onTerminate) {
   if (appConfig.utils !== false && !cluster.isWorker) {
     // TODO (fix): What about cluster?
 
-    const utilsBC = new BroadcastChannel('nxt:utils')
-    utilsBC.unref()
+    const utilsBC = new BroadcastChannel('nxt:utils').unref()
 
     function writeHeapSnapshot() {
       const snapshotPath = `${os.tmpdir()}/heap-${Date.now()}-${serviceName}-${serviceModule}-${serviceInstanceId}-${serviceWorkerId}-${threadId}.heapsnapshot`

package/cache.js

@@ -4,6 +4,21 @@ import { fastNow } from './time.js'
 
 function noop() {}
 
+const dbs = new Set()
+
+{
+  const offPeakBC = new BroadcastChannel('nxt:offPeak').unref()
+  offPeakBC.onmessage = () => {
+    for (const db of dbs) {
+      try {
+        db.purgeStale()
+      } catch (err) {
+        process.emitWarning(err)
+      }
+    }
+  }
+}
+
 /**
  * @template [V=unknown]
  * @typedef {object} AsyncCacheOptions
@@ -98,11 +113,14 @@ export class AsyncCache {
           );
         `)
 
-        this.#getQuery = this.#db.prepare(`SELECT val, ttl, stale FROM cache WHERE key = ?`)
+        this.#getQuery = this.#db.prepare(
+          `SELECT val, ttl, stale FROM cache WHERE key = ? AND stale > ?`,
+        )
         this.#setQuery = this.#db.prepare(
           `INSERT OR REPLACE INTO cache (key, val, ttl, stale) VALUES (?, ?, ?, ?)`,
         )
         this.#delQuery = this.#db.prepare(`DELETE FROM cache WHERE key = ?`)
+        this.#purgeStaleQuery = this.#db.prepare(`DELETE FROM cache WHERE stale <= ?`)
         break
       } catch (err) {
         if (n >= 8) {
@@ -118,15 +136,18 @@ export class AsyncCache {
         }
       }
     }
+
+    dbs.add(this)
   }
 
   close() {
+    dbs.delete(this)
     this.#db?.close()
   }
 
   /**
    * @param  {...any} args
-   * @returns {{ value: V|Promise<V>, async: boolean }}
+   * @returns {{ value: V, async: false } | { value: Promise<V>, async: true }}
    */
   get(...args) {
     return this.#load(args, true)
@@ -134,7 +155,7 @@ export class AsyncCache {
 
   /**
    * @param  {...any} args
-   * @returns {{ value: V|Promise<V>, async: boolean }}
+   * @returns {{ value: V, async: false } | { value: Promise<V>, async: true }}
    */
   peek(...args) {
     return this.#load(args, false)
@@ -148,10 +169,17 @@ export class AsyncCache {
     return this.#refresh(args)
   }
 
+  purgeStale() {
+    try {
+      this.#lru?.purgeStale()
+      this.#purgeStaleQuery?.run(fastNow())
+    } catch {}
+  }
+
   /**
    * @param  {any[]} args
    * @param  {boolean} refresh
-   * @returns {{ value: V|Promise<V>, async: boolean }}
+   * @returns {{ value: V, async: false } | { value: Promise<V>, async: true }}
    */
   #load(args, refresh) {
     const key = this.#keySelector(...args)
@@ -166,7 +194,7 @@ export class AsyncCache {
 
     if (cached === undefined) {
       try {
-        const ret = this.#getQuery?.get(key)
+        const ret = this.#getQuery?.get(key, now)
         if (ret !== undefined) {
           cached = {
             ttl: ret.ttl,
@@ -214,11 +242,13 @@ export class AsyncCache {
     if (promise === undefined && this.#valueSelector) {
       promise = this.#valueSelector(...args).then(
         (value) => {
-          this.set(key, value)
+          if (this.#dedupe.delete(key)) {
+            this.#set(key, value)
+          }
           return value
         },
         (err) => {
-          this.delete(key)
+          this.#delete(key)
           throw err
         },
       )
@@ -233,23 +263,31 @@ export class AsyncCache {
    * @param {string} key
    * @param {V} value
    */
-  set(key, value) {
+  #set(key, value) {
     if (typeof key !== 'string' || key.length === 0) {
       throw new TypeError('key must be a non-empty string')
     }
 
     const now = fastNow()
-    const cached = {
-      ttl: now + this.#ttl(value, key),
-      stale: now + this.#stale(value, key),
-      value,
+
+    const ttl = now + Math.max(0, this.#ttl(value, key) ?? 0)
+    if (!Number.isFinite(ttl)) {
+      throw new TypeError('ttl must be a finite number')
+    }
+
+    const stale = now + Math.max(ttl, this.#stale(value, key) ?? 0)
+    if (!Number.isFinite(stale)) {
+      throw new TypeError('stale must be a finite number')
+    }
+
+    if (stale <= now) {
+      return
     }
 
-    this.#lru?.set(key, cached)
-    this.#dedupe.delete(key)
+    this.#lru?.set(key, { ttl, stale, value })
 
     try {
-      this.#setQuery?.run(key, JSON.stringify(value), cached.ttl, cached.stale)
+      this.#setQuery?.run(key, JSON.stringify(value), ttl, stale)
     } catch {
       // Do nothing...
     }
@@ -258,7 +296,7 @@ export class AsyncCache {
   /**
    * @param {string} key
    */
-  delete(key) {
+  #delete(key) {
     if (typeof key !== 'string' || key.length === 0) {
       throw new TypeError('key must be a non-empty string')
     }

package/http.js

@@ -13,6 +13,8 @@ export const kAbortController = Symbol('abortController')
 const ERR_HEADER_EXPR =
   /^(content-length|content-type|te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
 
+const pending = (globalThis._nxt_lib_http_pending = new Set())
+
 // https://github.com/fastify/fastify/blob/main/lib/reqIdGenFactory.js
 // 2,147,483,647 (2^31 − 1) stands for max SMI value (an internal optimization of V8).
 // With this upper bound, if you'll be generating 1k ids/sec, you're going to hit it in ~25 days.
@@ -145,6 +147,7 @@ export async function upgradeMiddleware(ctx, next) {
   })
 
   const reqLogger = ctx.logger?.child({ req })
+  pending.add(ctx)
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
@@ -191,6 +194,7 @@ export async function upgradeMiddleware(ctx, next) {
     }
     socket.destroy(err)
   } finally {
+    pending.delete(ctx)
     if (!socket.writableEnded && !socket.destroyed) {
       socket.destroy()
       reqLogger?.warn('socket destroyed')
@@ -203,6 +207,7 @@ export async function requestMiddleware(ctx, next) {
   const startTime = performance.now()
 
   const reqLogger = ctx.logger?.child({ req })
+  pending.add(ctx)
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
     if (!isHealthcheck) {
@@ -334,6 +339,7 @@ export async function requestMiddleware(ctx, next) {
       res.destroy(err)
     }
   } finally {
+    pending.delete(ctx)
     if (res.writableEnded || res.destroyed || res.stream?.destroyed) {
       // Do nothing..
     } else {
@@ -728,6 +734,7 @@ export async function request(ctx, next) {
 
   let reqLogger = logger
 
+  pending.add(ctx)
   try {
     ctx.url = requestTarget(req)
     if (!ctx.url) {
@@ -837,6 +844,7 @@ export async function request(ctx, next) {
       }
     }
   } finally {
+    pending.delete(ctx)
     if (!res.writableEnded) {
       res.destroy()
       logger.debug('request destroyed')
@@ -914,6 +922,7 @@ export async function upgrade(ctx, next) {
 
   let aborted = false
   let reqLogger = logger
+  pending.add(ctx)
   try {
     ctx.url = requestTarget(req)
     if (!ctx.url) {
@@ -978,6 +987,7 @@ export async function upgrade(ctx, next) {
 
     socket.destroy(err)
   } finally {
+    pending.delete(ctx)
     queueMicrotask(() => ac.abort())
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.0.21",
+  "version": "26.0.23",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -77,7 +77,7 @@
     "http-errors": "^2.0.0",
     "json5": "^2.2.3",
     "lodash": "^4.17.21",
-    "lru-cache": "^11.1.0",
+    "lru-cache": "^11.2.1",
     "mime": "^4.0.7",
     "mitata": "^1.0.34",
     "moment-timezone": "^0.5.48",
@@ -109,6 +109,7 @@
     "lint-staged": "^16.1.5",
     "prettier": "^3.6.2",
     "rxjs": "^7.8.2",
+    "typescript": "^5.9.2",
     "typescript-eslint": "^8.40.0"
   },
   "peerDependencies": {

package/util/template/index-common.js

@@ -209,7 +209,7 @@ export function makeTemplateCompiler({ ds, proxify, logger, platform }) {
     return resolver ? (args$) => resolver(template, args$) : null
   }
 
-  function resolveTemplate(template, args$, options) {
+  async function resolveTemplate(template, args$, options) {
     const expr = _compileTemplate(template)
     return expr ? firstValueFrom(expr(template, args$), options) : template
   }