@nxtedition/lib 26.0.12 → 26.0.15

package/ass.js

@@ -31,8 +31,9 @@ const BASE_HEIGHT = 1080
  *
  * @typedef {object} EmbeddableSubtitleFontFace
  * @property {string} family
- * @property {'normal'|'bold'} weight
- * @property {'normal'|'italic'} style
+ * @property {string} name
+ * @property {'normal'|'bold'} [weight]
+ * @property {'normal'|'italic'} [style]
  * @property {Uint8Array} data
  *
  * @typedef {object} Styles
@@ -351,8 +352,10 @@ function encFontFaces(fontFaces) {
  * @param {EmbeddableSubtitleFontFace} fontFace
  */
 function getFontName(fontFace) {
-  const { family, weight, style } = fontFace
-  return `${family}_${weight === 'bold' ? 'B' : ''}${style === 'italic' ? 'I' : ''}0`
+  const { name, family, weight, style } = fontFace
+  // NOTE: Seems like libass doesn't care about the font name as specified in the original spec.
+  // That is good, because then we can register more faces than the original spec allowed.
+  return name ?? `${family}_${weight === 'bold' ? 'B' : ''}${style === 'italic' ? 'I' : ''}0`
 }
 
 /**

package/cache.js

@@ -103,6 +103,7 @@ export class AsyncCache {
           `INSERT OR REPLACE INTO cache (key, val, ttl, stale) VALUES (?, ?, ?, ?)`,
         )
         this.#delQuery = this.#db.prepare(`DELETE FROM cache WHERE key = ?`)
+        break
       } catch (err) {
         if (n >= 8) {
           this.#db?.close()
@@ -139,6 +140,14 @@ export class AsyncCache {
     return this.#load(args, false)
   }
 
+  /**
+   * @param  {...any} args
+   * @returns {Promise<V>}
+   */
+  refresh(...args) {
+    return this.#refresh(args)
+  }
+
   /**
    * @param  {any[]} args
    * @param  {boolean} refresh
@@ -189,30 +198,37 @@ export class AsyncCache {
       }
     }
 
-    let promise
-    if (this.#valueSelector && refresh) {
-      promise = this.#dedupe.get(key)
-      if (promise === undefined) {
-        promise = this.#valueSelector(...args).then(
-          (value) => {
-            this.set(key, value)
-            return value
-          },
-          (err) => {
-            this.delete(key)
-            throw err
-          },
-        )
-        promise.catch(noop)
-        this.#dedupe.set(key, promise)
-      }
-    }
+    const promise = refresh ? this.#refresh(args, key) : null
 
     return cached !== undefined
       ? { value: cached.value, async: false }
       : { value: promise, async: true }
   }
 
+  #refresh(args, key = this.#keySelector(...args)) {
+    if (typeof key !== 'string' || key.length === 0) {
+      throw new TypeError('keySelector must return a non-empty string')
+    }
+
+    let promise = this.#dedupe.get(key)
+    if (promise === undefined && this.#valueSelector) {
+      promise = this.#valueSelector(...args).then(
+        (value) => {
+          this.set(key, value)
+          return value
+        },
+        (err) => {
+          this.delete(key)
+          throw err
+        },
+      )
+      promise.catch(noop)
+      this.#dedupe.set(key, promise)
+    }
+
+    return promise
+  }
+
   /**
    * @param {string} key
    * @param {V} value

package/package.json

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