@nxtedition/lib 26.0.8 → 26.0.10

package/cache.js

@@ -4,13 +4,29 @@ import { fastNow } from './time.js'
 
 function noop() {}
 
+/**
+ * @template [V=unknown]
+ * @typedef {object} AsyncCacheOptions
+ * @property {number | ((value: V, key: string) => number)} [ttl]
+ * @property {number | ((value: V, key: string) => number)} [stale]
+ * @property {import('lru-cache').LRUCache.Options<string, { ttl: number, stale: number, value: V }> | false | null} [lru]
+ * @property {{ timeout?: number }} [db]
+ */
+
+/**
+ * @template [V=unknown]
+ */
 export class AsyncCache {
-  /** @type LRUCache<string, { ttl: number, stale: number, value: any } **/
+  /** @type LRUCache<string, { ttl: number, stale: number, value: V }> */
   #lru
   #valueSelector
   #keySelector
   #dedupe = new Map()
+
+  /** @type {(val: V, key: string) => number} */
   #ttl
+
+  /** @type {(val: V, key: string) => number} */
   #stale
 
   #db
@@ -18,6 +34,12 @@ export class AsyncCache {
   #setQuery
   #delQuery
 
+  /**
+   * @param {string} location
+   * @param {((...args: any[]) => Promise<V>)|undefined} [valueSelector]
+   * @param {((...args: any[]) => string)|undefined} [keySelector]
+   * @param {AsyncCacheOptions<V>} [opts]
+   */
   constructor(location, valueSelector, keySelector, opts) {
     if (typeof location === 'string') {
       // Do nothing...
@@ -57,26 +79,41 @@ export class AsyncCache {
 
     this.#lru =
       opts?.lru === false || opts?.lru === null ? null : new LRUCache({ max: 4096, ...opts?.lru })
-    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 = ?`)
+
+    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) {
+        this.#db?.close()
+        this.#db = null
+
+        this.#getQuery = null
+        this.#setQuery = null
+        this.#delQuery = null
+
+        process.emitWarning(err)
+      }
+    }
   }
 
   close() {
@@ -85,7 +122,7 @@ export class AsyncCache {
 
   /**
    * @param  {...any} args
-   * @returns {{ value: Promise<unknown>|unknown, async: boolean }}
+   * @returns {{ value: V|Promise<V>, async: boolean }}
    */
   get(...args) {
     const key = this.#keySelector(...args)
@@ -158,7 +195,7 @@ export class AsyncCache {
 
   /**
    * @param {string} key
-   * @param {any} value
+   * @param {V} value
    */
   set(key, value) {
     if (typeof key !== 'string' || key.length === 0) {
@@ -182,6 +219,9 @@ export class AsyncCache {
     }
   }
 
+  /**
+   * @param {string} key
+   */
   delete(key) {
     if (typeof key !== 'string' || key.length === 0) {
       throw new TypeError('key must be a non-empty string')

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.8",
+  "version": "26.0.10",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",