@nxtedition/lib 28.0.18 → 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/http.js

@@ -216,6 +216,10 @@ export async function requestMiddleware(ctx, next) {
     stats.pending++
   }
 
+  if (ctx[kPendingIndex] !== -1) {
+    throw new Error('context is already pending')
+  }
+
   ctx[kPendingIndex] = pending.push(ctx) - 1
   try {
     const isHealthcheck = req.url === '/healthcheck' || req.url === '/_up'
@@ -366,11 +370,12 @@ export async function requestMiddleware(ctx, next) {
 
     if (ctx[kPendingIndex] !== -1) {
       const idx = ctx[kPendingIndex]
+      ctx[kPendingIndex] = -1
+
       const tmp = pending.pop()
       if (tmp !== ctx) {
         pending[idx] = tmp
         pending[idx][kPendingIndex] = idx
-        tmp[kPendingIndex] = -1
       }
     }
 
@@ -464,10 +469,12 @@ export class ServerResponse extends http.ServerResponse {
     return this.#bytesWritten
   }
 
+  /** @deprecated */
   setHeaders() {
     throw new Error('not supported')
   }
 
+  /** @deprecated */
   appendHeader() {
     throw new Error('not supported')
   }
@@ -530,7 +537,6 @@ export class ServerResponse extends http.ServerResponse {
   /**
    * @param {number} statusCode
    * @param {Record<string, string>} [headers]
-   * @returns
    */
   writeHead(statusCode, headers) {
     if (this.#headersSent) {
@@ -554,7 +560,6 @@ export class ServerResponse extends http.ServerResponse {
 
   /**
    * @param {net.Socket} socket
-   * @returns
    */
   assignSocket(socket) {
     if (!this.destroyed) {
@@ -565,6 +570,11 @@ export class ServerResponse extends http.ServerResponse {
     return super.assignSocket(socket)
   }
 
+  /**
+   * @param {Buffer|string} chunk
+   * @param {string} [encoding]
+   * @param {(err: Error) => void} [callback]
+   */
   write(chunk, encoding, callback) {
     if (!this.destroyed) {
       if (this.#data === -1) {
@@ -587,6 +597,11 @@ export class ServerResponse extends http.ServerResponse {
     return super.write(chunk, encoding, callback)
   }
 
+  /**
+   * @param {Buffer|string} chunk
+   * @param {string} [encoding]
+   * @param {(err: Error) => void} [callback]
+   */
   end(chunk, encoding, callback) {
     if (!this.destroyed) {
       this.#end = performance.now() - this.#created
@@ -612,9 +627,7 @@ export class ServerResponse extends http.ServerResponse {
   }
 
   /**
-   *
    * @param {Error} [err]
-   * @returns
    */
   destroy(err) {
     if (!this.destroyed) {
@@ -672,11 +685,14 @@ export class Http2ServerRequest extends http2.Http2ServerRequest {
 export class Http2ServerResponse extends http2.Http2ServerResponse {
   #created = performance.now()
   #bytesWritten = 0
-  #connect = -1
+  #connect = 0
   #headers = -1
   #data = -1
   #end = -1
 
+  #headersObj = kEmptyObj
+  #headersSent = false
+
   /**
    * @returns {{
    *   created: number,
@@ -696,19 +712,108 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
     }
   }
 
+  /**
+   * @returns {number}
+   */
   get bytesWritten() {
     return this.#bytesWritten
   }
 
-  flushHeaders() {
+  /** @deprecated */
+  setHeaders() {
+    throw new Error('not supported')
+  }
+
+  /** @deprecated */
+  appendHeader() {
+    throw new Error('not supported')
+  }
+
+  /**
+   * @param {string} key
+   * @param {string} val
+   */
+  setHeader(key, val) {
+    if (this.#headersSent) {
+      throw new Error('headers already sent')
+    }
+
+    if (this.#headersObj === kEmptyObj) {
+      this.#headersObj = {}
+    }
+
+    this.#headersObj[key] = val === undefined ? undefined : `${val}`
+  }
+
+  /**
+   * @param {string} key
+   * @param {string} val
+   */
+  removeHeader(key, val) {
+    if (this.#headersSent) {
+      throw new Error('headers already sent')
+    }
+
+    if (this.#headersObj !== kEmptyObj) {
+      delete this.#headersObj[key]
+    }
+  }
+
+  /**
+   * @returns {string[]}
+   */
+  getHeaderNames() {
+    if (this.#headersSent) {
+      throw new Error('headers already sent')
+    }
+
+    return this.#headersObj === kEmptyObj ? kEmptyArr : Object.keys(this.#headersObj)
+  }
+
+  /**
+   * @returns {Record<string, string>}
+   */
+  getHeaders() {
+    return this.#headersObj
+  }
+
+  /**
+   * @returns {boolean}
+   */
+  get headersSent() {
+    return this.#headersSent
+  }
+
+  /**
+   * @param {number} statusCode
+   * @param {Record<string, string>} [headers]
+   * @returns
+   */
+  writeHead(statusCode, headers) {
+    if (this.#headersSent) {
+      throw new Error('headers already sent')
+    }
+
+    if (this.#headersObj !== kEmptyObj) {
+      headers = headers ? Object.assign(this.#headersObj, headers) : this.#headersObj
+    }
+
     if (!this.destroyed) {
       if (this.#headers === -1) {
         this.#headers = performance.now() - this.#created
       }
     }
-    return super.flushHeaders()
+
+    this.#headersSent = true
+
+    return super.writeHead(statusCode, headers)
   }
 
+  /**
+   * @param {Buffer|string} chunk
+   * @param {string} [encoding]
+   * @param {(err: Error) => void} [callback]
+   */
   write(chunk, encoding, callback) {
     if (!this.destroyed) {
       if (this.#data === -1) {
@@ -731,6 +836,11 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
     return super.write(chunk, encoding, callback)
   }
 
+  /**
+   * @param {Buffer|string} chunk
+   * @param {string} [encoding]
+   * @param {(err: Error) => void} [callback]
+   */
   end(chunk, encoding, callback) {
     if (!this.destroyed) {
       this.#end = performance.now() - this.#created
@@ -755,6 +865,9 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
     return super.end(chunk, encoding, callback)
   }
 
+  /**
+   * @param {Error} [err]
+   */
   destroy(err) {
     if (!this.destroyed) {
       if (this.#end === -1) {

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.18",
+  "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": "0e9eba55a86700d53a902b3478366d6cb9791634"
+  "gitHead": "d6448b2a05077952c84d8fb8bcbcbf0c2d78fbd5"
 }