@nxtedition/nxt-undici 7.3.5 → 7.3.7

package/lib/interceptor/log.js

@@ -19,6 +19,9 @@ class Handler extends DecoratorHandler {
   #statusCode
   #headers
 
+  #globalIndex = -1
+  #globalArray = (globalThis.__undici_requests ??= [])
+
   constructor(logOpts, opts, { handler }) {
     super(handler)
 
@@ -31,6 +34,8 @@ class Handler extends DecoratorHandler {
 
     this.#logger.debug('upstream request started')
     this.#timing.created = this.#created + performance.timeOrigin
+
+    this.#globalIndex = this.#globalArray.push(this) - 1
   }
 
   onConnect(abort) {
@@ -110,6 +115,8 @@ class Handler extends DecoratorHandler {
       this.#logger.debug(data, 'upstream request completed')
     }
 
+    this.onDone()
+
     super.onComplete()
   }
 
@@ -137,8 +144,21 @@ class Handler extends DecoratorHandler {
       this.#logger.error(data, 'upstream request failed')
     }
 
+    this.onDone()
+
     super.onError(err)
   }
+
+  onDone() {
+    if (this.#globalIndex !== -1) {
+      const tmp = this.#globalArray.pop()
+      if (tmp !== this) {
+        this.#globalArray[this.#globalIndex] = tmp
+        tmp.#globalIndex = this.#globalIndex
+      }
+      this.#globalIndex = -1
+    }
+  }
 }
 
 export default (logOpts) => (dispatch) => (opts, handler) =>

package/lib/sqlite-cache-store.js

@@ -73,10 +73,14 @@ export class SqliteCacheStore {
   constructor(opts) {
     this.#db = new DatabaseSync(opts?.location ?? ':memory:', { timeout: 40, ...opts?.db })
 
+    const maxSize = opts?.maxSize ?? 256 * 1024 * 1024
     this.#db.exec(`
       PRAGMA journal_mode = WAL;
-      PRAGMA synchronous = NORMAL;
-      PRAGMA temp_store = memory;
+      PRAGMA synchronous = OFF;
+      PRAGMA wal_autocheckpoint = 10000;
+      PRAGMA cache_size = -${Math.ceil(maxSize / 1024 / 8)};
+      PRAGMA mmap_size = ${maxSize};
+      PRAGMA max_page_count = ${Math.ceil(maxSize / 4096)};
       PRAGMA optimize;
 
       CREATE TABLE IF NOT EXISTS cacheInterceptorV${VERSION} (
@@ -101,12 +105,6 @@ export class SqliteCacheStore {
       CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_deleteExpiredValuesQuery ON cacheInterceptorV${VERSION}(deleteAt);
     `)
 
-    const maxSize = opts?.maxSize ?? 256 * 1024 * 1024
-    {
-      const { page_size: pageSize } = this.#db.prepare('PRAGMA page_size').get()
-      this.#db.exec(`PRAGMA max_page_count = ${Math.ceil(maxSize / pageSize)}`)
-    }
-
     this.#getValuesQuery = this.#db.prepare(`
       SELECT
         id,
@@ -159,6 +157,8 @@ export class SqliteCacheStore {
 
   purgeStale() {
     this.#prune()
+    this.#db.exec('PRAGMA wal_checkpoint(TRUNCATE)')
+    this.#db.exec('PRAGMA optimize')
   }
 
   close() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "7.3.5",
+  "version": "7.3.7",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",