@trieb.work/nextjs-turbo-redis-cache 1.18.0 → 1.18.1

package/dist/index.mjs

@@ -67,26 +67,27 @@ var SyncedMap = class {
     this.setupLockResolve();
   }
   async initialSync() {
-    let cursor = 0;
-    const hScanOptions = { COUNT: this.querySize };
+    let cursor = "0";
     try {
       do {
-        const remoteItems = await redisErrorHandler(
-          "SyncedMap.initialSync(), operation: hScan " + this.syncChannel + " " + this.keyPrefix + " " + this.redisKey + " " + cursor + " " + this.querySize,
-          this.client.hScan(
+        const [nextCursor, tuples] = await redisErrorHandler(
+          "SyncedMap.initialSync(), operation: HSCAN " + this.keyPrefix + this.redisKey,
+          this.client.sendCommand([
+            "HSCAN",
             this.keyPrefix + this.redisKey,
             cursor,
-            hScanOptions
-          )
+            "COUNT",
+            String(this.querySize)
+          ])
         );
-        for (const { field, value } of remoteItems.tuples) {
+        for (let i = 0; i < tuples.length; i += 2) {
+          const field = tuples[i];
           if (this.filterKeys(field)) {
-            const parsedValue = JSON.parse(value);
-            this.map.set(field, parsedValue);
+            this.map.set(field, JSON.parse(tuples[i + 1]));
           }
         }
-        cursor = remoteItems.cursor;
-      } while (cursor !== 0);
+        cursor = nextCursor;
+      } while (cursor !== "0");
       if (!this.customizedSync?.withoutOrphanCleanup) {
         await this.cleanupKeysNotInRedis();
       }
@@ -96,18 +97,24 @@ var SyncedMap = class {
     }
   }
   async cleanupKeysNotInRedis() {
-    let cursor = 0;
-    const scanOptions = { COUNT: this.querySize, MATCH: `${this.keyPrefix}*` };
+    let cursor = "0";
     let remoteKeys = [];
     try {
       do {
-        const remoteKeysPortion = await redisErrorHandler(
-          "SyncedMap.cleanupKeysNotInRedis(), operation: scan " + this.keyPrefix,
-          this.client.scan(cursor, scanOptions)
+        const [nextCursor, keys] = await redisErrorHandler(
+          "SyncedMap.cleanupKeysNotInRedis(), operation: SCAN " + this.keyPrefix,
+          this.client.sendCommand([
+            "SCAN",
+            cursor,
+            "MATCH",
+            `${this.keyPrefix}*`,
+            "COUNT",
+            String(this.querySize)
+          ])
         );
-        remoteKeys = remoteKeys.concat(remoteKeysPortion.keys);
-        cursor = remoteKeysPortion.cursor;
-      } while (cursor !== 0);
+        remoteKeys = remoteKeys.concat(keys);
+        cursor = nextCursor;
+      } while (cursor !== "0");
       const remoteKeysSet = new Set(
         remoteKeys.map((key) => key.substring(this.keyPrefix.length))
       );