@nxtedition/lib 26.0.9 → 26.0.11

package/cache.js

@@ -80,34 +80,37 @@ export class AsyncCache {
     this.#lru =
       opts?.lru === false || opts?.lru === null ? null : new LRUCache({ max: 4096, ...opts?.lru })
 
-    for (let n = 0; true; n += 1) {
-      try {
-        this.#db = new DatabaseSync(location, { timeout: 20, ...opts?.db })
-
-        this.#db.exec(`
-          PRAGMA journal_mode = WAL;
-          PRAGMA synchronous = NORMAL;
-          PRAGMA temp_store = memory;
-          PRAGMA optimize;
-
-          CREATE TABLE IF NOT EXISTS cache (
-            key TEXT PRIMARY KEY NOT NULL,
-            val TEXT NOT NULL,
-            ttl INTEGER NOT NULL,
-            stale INTEGER NOT NULL
-          );
-        `)
-
-        this.#getQuery = this.#db.prepare(`SELECT val, ttl, stale FROM cache WHERE key = ?`)
-        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 = ?`)
-      } catch (err) {
-        if (n > 128 || !/locked|busy/i.test(err?.message)) {
-          throw err
-        }
-      }
+    try {
+      this.#db = new DatabaseSync(location, { timeout: 20, ...opts?.db })
+
+      this.#db.exec(`
+        PRAGMA journal_mode = WAL;
+        PRAGMA synchronous = NORMAL;
+        PRAGMA temp_store = memory;
+        PRAGMA optimize;
+
+        CREATE TABLE IF NOT EXISTS cache (
+          key TEXT PRIMARY KEY NOT NULL,
+          val TEXT NOT NULL,
+          ttl INTEGER NOT NULL,
+          stale INTEGER NOT NULL
+        );
+      `)
+
+      this.#getQuery = this.#db.prepare(`SELECT val, ttl, stale FROM cache WHERE key = ?`)
+      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 = ?`)
+    } catch (err) {
+      this.#db?.close()
+      this.#db = null
+
+      this.#getQuery = null
+      this.#setQuery = null
+      this.#delQuery = null
+
+      process.emitWarning(err)
     }
   }
 

package/http.js

@@ -75,7 +75,7 @@ export class Context {
       return this.#req.target
     }
 
-    this.#target ??= requestTarget(this.#req)
+    this.#target ??= Object.freeze(requestTarget(this.#req))
 
     if (!this.#target) {
       throw new createError.BadRequest('invalid url')
@@ -89,13 +89,10 @@ export class Context {
       return this.#req.query
     }
 
-    this.#target ??= requestTarget(this.#req)
-    this.#query ??=
-      this.#target.search.length > 1
-        ? Object.freeze(querystring.parse(this.#target.search.slice(1)))
-        : {}
+    const search = this.target.search
 
-    return this.#query
+    return (this.#query ??=
+      search.length > 1 ? Object.freeze(querystring.parse(search.slice(1))) : {})
   }
 
   get userAgent() {
@@ -373,7 +370,13 @@ export class IncomingMessage extends http.IncomingMessage {
       this.#target = undefined
     }
 
-    return (this.#target ??= requestTarget(this))
+    this.#target ??= Object.freeze(requestTarget(this))
+
+    if (!this.#target) {
+      throw new createError.BadRequest('invalid url')
+    }
+
+    return this.#target
   }
 
   get query() {

package/package.json

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