@nxtedition/lib 28.0.20 → 28.0.21

package/app.js

@@ -810,7 +810,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
                   messages.push({
                     id: 'app:container_memory_usage',
                     level: usagePercent > 90 ? 50 : usagePercent > 70 ? 40 : 30,
-                    msg: `Memory Usage: ${usagePercent.toFixed(2)}%`,
+                    msg: `Memory Usage: ${usagePercent.toFixed(2)}% (${(memory.containerUsage / 1e9).toFixed(2)} GiB / ${(memory.containerLimit / 1e9).toFixed(2)} GiB)`,
                   })
                 }
 

package/cache.js

@@ -1,6 +1,7 @@
 import { DatabaseSync } from 'node:sqlite'
 import { LRUCache } from 'lru-cache'
 import { fastNow } from './time.js'
+import { doYield } from '@nxtedition/yield'
 
 function noop() {}
 
@@ -50,6 +51,8 @@ export class AsyncCache {
   #delQuery
   #purgeStaleQuery
 
+  #setQueue = []
+
   /**
    * @param {string} location
    * @param {((...args: any[]) => Promise<V>)|undefined} [valueSelector]
@@ -304,10 +307,23 @@ export class AsyncCache {
 
     this.#lru?.set(key, { ttl, stale, value })
 
-    try {
-      this.#setQuery?.run(key, JSON.stringify(value), ttl, stale)
-    } catch {
-      // Do nothing...
+    this.#setQueue.push({ key, value, ttl, stale })
+    if (this.#setQueue.length === 1) {
+      doYield(this.#flushSetQueue)
+    }
+  }
+
+  #flushSetQueue = () => {
+    for (const { key, value, ttl, stale } of this.#setQueue.splice(0, 64)) {
+      try {
+        this.#setQuery?.run(key, JSON.stringify(value), ttl, stale)
+      } catch {
+        // Do nothing...
+      }
+    }
+
+    if (this.#setQueue.length > 0) {
+      doYield(this.#flushSetQueue)
     }
   }
 

package/memory.js

@@ -1,5 +1,7 @@
 import { readFileSync } from 'node:fs'
 
+const INACTIVE_FILE_REGEX = /^inactive_file\s+(\d+)/m
+
 function readFile(path) {
   try {
     return readFileSync(path, 'utf8').trim()
@@ -30,13 +32,19 @@ export function getContainerMemoryUsage() {
   // cgroups v2
   const v2Usage = readFile('/sys/fs/cgroup/memory.current')
   if (v2Usage) {
-    return Number(v2Usage)
+    const usage = Number(v2Usage)
+    const stat = readFile('/sys/fs/cgroup/memory.stat')
+    const inactiveFile = Number(stat?.match(INACTIVE_FILE_REGEX)?.[1] ?? 0)
+    return Math.max(0, usage - inactiveFile)
   }
 
   // cgroups v1
   const v1Usage = readFile('/sys/fs/cgroup/memory/memory.usage_in_bytes')
   if (v1Usage) {
-    return Number(v1Usage)
+    const usage = Number(v1Usage)
+    const stat = readFile('/sys/fs/cgroup/memory/memory.stat')
+    const inactiveFile = Number(stat?.match(INACTIVE_FILE_REGEX)?.[1] ?? 0)
+    return Math.max(0, usage - inactiveFile)
   }
 
   return undefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "28.0.20",
+  "version": "28.0.21",
   "license": "UNLICENSED",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -54,6 +54,7 @@
     "@nxtedition/sched": "^1.0.2",
     "@nxtedition/template": "^1.0.10",
     "@nxtedition/weak-cache": "^1.0.2",
+    "@nxtedition/yield": "^1.0.2",
     "diff": "5.2.0",
     "fast-querystring": "^1.1.2",
     "flamegraph-middleware": "^1.0.0",
@@ -92,5 +93,5 @@
     "pino": ">=7.0.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "b33dfcfc5f68626f846f364805f51a0e6de74cce"
+  "gitHead": "d6448b2a05077952c84d8fb8bcbcbf0c2d78fbd5"
 }