@serwist/expiration 9.0.0-preview.15 → 9.0.0-preview.17

package/dist/index.js

@@ -15,12 +15,12 @@ class CacheTimestampsModel {
     constructor(cacheName){
         this._cacheName = cacheName;
     }
+    _getId(url) {
+        return `${this._cacheName}|${normalizeURL(url)}`;
+    }
     _upgradeDb(db) {
         const objStore = db.createObjectStore(CACHE_OBJECT_STORE, {
-            keyPath: [
-                "url",
-                "cacheName"
-            ]
+            keyPath: "id"
         });
         objStore.createIndex("cacheName", "cacheName", {
             unique: false
@@ -38,6 +38,7 @@ class CacheTimestampsModel {
     async setTimestamp(url, timestamp) {
         url = normalizeURL(url);
         const entry = {
+            id: this._getId(url),
             cacheName: this._cacheName,
             url,
             timestamp
@@ -51,10 +52,7 @@ class CacheTimestampsModel {
     }
     async getTimestamp(url) {
         const db = await this.getDb();
-        const entry = await db.get(CACHE_OBJECT_STORE, [
-            this._cacheName,
-            normalizeURL(url)
-        ]);
+        const entry = await db.get(CACHE_OBJECT_STORE, this._getId(url));
         return entry?.timestamp;
     }
     async expireEntries(minTimestamp, maxCount) {

package/dist/models/CacheTimestampsModel.d.ts

@@ -13,6 +13,14 @@ export declare class CacheTimestampsModel {
      * @private
      */
     constructor(cacheName: string);
+    /**
+     * Takes a URL and returns an ID that will be unique in the object store.
+     *
+     * @param url
+     * @returns
+     * @private
+     */
+    private _getId;
     /**
      * Performs an upgrade of indexedDB.
      *

package/dist/models/CacheTimestampsModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CacheTimestampsModel.d.ts","sourceRoot":"","sources":["../../src/models/CacheTimestampsModel.ts"],"names":[],"mappings":"AAmCA;;;;GAIG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,GAAG,CAA4C;IAEvD;;;;;OAKG;gBACS,SAAS,EAAE,MAAM;IAI7B;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAYlB;;;;;;OAMG;IACH,OAAO,CAAC,yBAAyB;IAOjC;;;;;OAKG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBjE;;;;;;OAMG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAM5D;;;;;;;;;OASG;IACG,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAyB/E;;;;OAIG;YACW,KAAK;CAQpB"}
+{"version":3,"file":"CacheTimestampsModel.d.ts","sourceRoot":"","sources":["../../src/models/CacheTimestampsModel.ts"],"names":[],"mappings":"AAoCA;;;;GAIG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,GAAG,CAA4C;IAEvD;;;;;OAKG;gBACS,SAAS,EAAE,MAAM;IAI7B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM;IAId;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAYlB;;;;;;OAMG;IACH,OAAO,CAAC,yBAAyB;IAOjC;;;;;OAKG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBjE;;;;;;OAMG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAM5D;;;;;;;;;OASG;IACG,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAyB/E;;;;OAIG;YACW,KAAK;CAQpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/expiration",
-  "version": "9.0.0-preview.15",
+  "version": "9.0.0-preview.17",
   "type": "module",
   "description": "A module that expires cached responses based on age or maximum number of entries.",
   "files": [
@@ -30,12 +30,12 @@
   },
   "dependencies": {
     "idb": "8.0.0",
-    "@serwist/core": "9.0.0-preview.15"
+    "@serwist/core": "9.0.0-preview.17"
   },
   "devDependencies": {
     "rollup": "4.13.0",
     "typescript": "5.5.0-dev.20240323",
-    "@serwist/constants": "9.0.0-preview.15"
+    "@serwist/constants": "9.0.0-preview.17"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0"

package/src/CacheExpiration.ts

@@ -134,7 +134,7 @@ export class CacheExpiration {
       void this.expireEntries();
     }
   }
-  
+
   /**
    * Updates the timestamp for the given URL, allowing it to be correctly
    * tracked by the class.

package/src/ExpirationPlugin.ts

@@ -25,7 +25,7 @@ export interface ExpirationPluginOptions {
   /**
    * Determines whether `maxAgeSeconds` should be calculated from when an
    * entry was last fetched or when it was last used.
-   * 
+   *
    * @default "last-fetched"
    */
   maxAgeFrom?: "last-fetched" | "last-used";

package/src/models/CacheTimestampsModel.ts

@@ -20,6 +20,7 @@ const normalizeURL = (unNormalizedUrl: string) => {
 };
 
 interface CacheTimestampsModelEntry {
+  id: string;
   cacheName: string;
   url: string;
   timestamp: number;
@@ -27,7 +28,7 @@ interface CacheTimestampsModelEntry {
 
 interface CacheDbSchema extends DBSchema {
   "cache-entries": {
-    key: [string, string];
+    key: string;
     value: CacheTimestampsModelEntry;
     indexes: { cacheName: string; timestamp: number };
   };
@@ -52,6 +53,17 @@ export class CacheTimestampsModel {
     this._cacheName = cacheName;
   }
 
+  /**
+   * Takes a URL and returns an ID that will be unique in the object store.
+   *
+   * @param url
+   * @returns
+   * @private
+   */
+  private _getId(url: string): string {
+    return `${this._cacheName}|${normalizeURL(url)}`;
+  }
+
   /**
    * Performs an upgrade of indexedDB.
    *
@@ -61,7 +73,7 @@ export class CacheTimestampsModel {
    */
   private _upgradeDb(db: IDBPDatabase<CacheDbSchema>) {
     const objStore = db.createObjectStore(CACHE_OBJECT_STORE, {
-      keyPath: ["url", "cacheName"],
+      keyPath: "id",
     });
 
     // TODO(philipwalton): once we don't have to support EdgeHTML, we can
@@ -95,6 +107,7 @@ export class CacheTimestampsModel {
     url = normalizeURL(url);
 
     const entry = {
+      id: this._getId(url),
       cacheName: this._cacheName,
       url,
       timestamp,
@@ -116,7 +129,7 @@ export class CacheTimestampsModel {
    */
   async getTimestamp(url: string): Promise<number | undefined> {
     const db = await this.getDb();
-    const entry = await db.get(CACHE_OBJECT_STORE, [this._cacheName, normalizeURL(url)]);
+    const entry = await db.get(CACHE_OBJECT_STORE, this._getId(url));
     return entry?.timestamp;
   }