@b9g/cache-redis 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b9g/cache-redis",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Redis cache adapter for Shovel cache system",
   "keywords": [
     "cache",
@@ -17,13 +17,14 @@
     "directory": "packages/cache-redis"
   },
   "dependencies": {
+    "@logtape/logtape": "^1.2.0",
     "redis": "^4.6.10"
   },
   "devDependencies": {
-    "@b9g/libuild": "^0.1.11"
+    "@b9g/libuild": "^0.1.18"
   },
   "peerDependencies": {
-    "@b9g/cache": "^0.1.4"
+    "@b9g/cache": "^0.1.5"
   },
   "type": "module",
   "types": "src/index.d.ts",
@@ -31,23 +32,19 @@
     "README.md",
     "src/"
   ],
-  "main": "src/index.cjs",
   "module": "src/index.js",
   "exports": {
     ".": {
       "types": "./src/index.d.ts",
-      "import": "./src/index.js",
-      "require": "./src/index.cjs"
+      "import": "./src/index.js"
     },
     "./index": {
       "types": "./src/index.d.ts",
-      "import": "./src/index.js",
-      "require": "./src/index.cjs"
+      "import": "./src/index.js"
     },
     "./index.js": {
       "types": "./src/index.d.ts",
-      "import": "./src/index.js",
-      "require": "./src/index.cjs"
+      "import": "./src/index.js"
     },
     "./package.json": "./package.json"
   }

package/src/index.js

@@ -3,7 +3,22 @@
 import { Cache, generateCacheKey } from "@b9g/cache";
 import { createClient } from "redis";
 import { getLogger } from "@logtape/logtape";
-var logger = getLogger(["cache-redis"]);
+var logger = getLogger(["platform"]);
+function uint8ArrayToBase64(bytes) {
+  let binary = "";
+  for (let i = 0; i < bytes.length; i++) {
+    binary += String.fromCharCode(bytes[i]);
+  }
+  return btoa(binary);
+}
+function base64ToUint8Array(base64) {
+  const binary = atob(base64);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++) {
+    bytes[i] = binary.charCodeAt(i);
+  }
+  return bytes;
+}
 var RedisCache = class extends Cache {
   #client;
   #prefix;
@@ -18,7 +33,7 @@ var RedisCache = class extends Cache {
     this.#maxEntrySize = options.maxEntrySize || 10 * 1024 * 1024;
     this.#connected = false;
     this.#client.on("error", (err) => {
-      logger.error("Redis error", { error: err });
+      logger.error("Redis error: {error}", { error: err });
     });
     this.#client.on("connect", () => {
       logger.info("Connected to Redis", { cache: name });
@@ -63,7 +78,7 @@ var RedisCache = class extends Cache {
       status: response.status,
       statusText: response.statusText,
       headers,
-      body: btoa(String.fromCharCode(...new Uint8Array(body))),
+      body: uint8ArrayToBase64(new Uint8Array(body)),
       cachedAt: Date.now(),
       TTL: this.#defaultTTL
     };
@@ -72,7 +87,7 @@ var RedisCache = class extends Cache {
    * Deserialize cache entry to Response
    */
   #deserializeResponse(entry) {
-    const body = Uint8Array.from(atob(entry.body), (c) => c.charCodeAt(0));
+    const body = base64ToUint8Array(entry.body);
     return new Response(body, {
       status: entry.status,
       statusText: entry.statusText,
@@ -100,7 +115,7 @@ var RedisCache = class extends Cache {
       }
       return this.#deserializeResponse(entry);
     } catch (error) {
-      logger.error("Failed to match", { error });
+      logger.error("Failed to match: {error}", { error });
       return void 0;
     }
   }
@@ -119,7 +134,7 @@ var RedisCache = class extends Cache {
         await this.#client.set(key, serialized);
       }
     } catch (error) {
-      logger.error("Failed to put", { error });
+      logger.error("Failed to put: {error}", { error });
       throw error;
     }
   }
@@ -133,7 +148,7 @@ var RedisCache = class extends Cache {
       const result = await this.#client.del(key);
       return result > 0;
     } catch (error) {
-      logger.error("Failed to delete", { error });
+      logger.error("Failed to delete: {error}", { error });
       return false;
     }
   }
@@ -164,12 +179,14 @@ var RedisCache = class extends Cache {
           if (method && url) {
             requests.push(new Request(url, { method }));
           }
-        } catch {
+        } catch (err) {
+          if (!(err instanceof TypeError))
+            throw err;
         }
       }
       return requests;
     } catch (error) {
-      logger.error("Failed to get keys", { error });
+      logger.error("Failed to get keys: {error}", { error });
       return [];
     }
   }
@@ -192,7 +209,8 @@ var RedisCache = class extends Cache {
           if (value) {
             totalSize += new TextEncoder().encode(value).length;
           }
-        } catch {
+        } catch (err) {
+          logger.debug("Error reading key {key}: {error}", { key, error: err });
         }
       }
       return {
@@ -204,7 +222,7 @@ var RedisCache = class extends Cache {
         maxEntrySize: this.#maxEntrySize
       };
     } catch (error) {
-      logger.error("Failed to get stats", { error });
+      logger.error("Failed to get stats: {error}", { error });
       return {
         connected: false,
         keyCount: 0,
@@ -225,11 +243,11 @@ var RedisCache = class extends Cache {
         await this.#client.quit();
         logger.info("Redis connection closed", { prefix: this.#prefix });
       } catch (error) {
-        logger.error("Error closing Redis connection", { error });
+        logger.error("Error closing Redis connection: {error}", { error });
         try {
           await this.#client.disconnect();
         } catch (disconnectError) {
-          logger.error("Error forcing Redis disconnect", {
+          logger.error("Error forcing Redis disconnect: {error}", {
             error: disconnectError
           });
         }