@b9g/cache-redis 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b9g/cache-redis",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Redis cache adapter for Shovel cache system",
   "keywords": [
     "cache",
@@ -24,7 +24,7 @@
     "@b9g/libuild": "^0.1.18"
   },
   "peerDependencies": {
-    "@b9g/cache": "^0.1.4"
+    "@b9g/cache": "^0.1.5"
   },
   "type": "module",
   "types": "src/index.d.ts",
@@ -32,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;
@@ -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,
@@ -164,7 +179,9 @@ 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;
@@ -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 {
@@ -229,7 +247,9 @@ var RedisCache = class extends Cache {
         try {
           await this.#client.disconnect();
         } catch (disconnectError) {
-          logger.error("Error forcing Redis disconnect: {error}", { error: disconnectError });
+          logger.error("Error forcing Redis disconnect: {error}", {
+            error: disconnectError
+          });
         }
       }
     }