@trieb.work/nextjs-turbo-redis-cache 1.8.0-beta.4 → 1.8.0-beta.6

package/src/SyncedMap.ts

@@ -1,9 +1,5 @@
 // SyncedMap.ts
-import {
-  Client,
-  getTimeoutRedisCommandOptions,
-  redisErrorHandler,
-} from './RedisStringsHandler';
+import { Client, redisErrorHandler } from './RedisStringsHandler';
 import { debugVerbose, debug } from './utils/debug';
 
 type CustomizedSync = {
@@ -16,7 +12,6 @@ type SyncedMapOptions = {
   keyPrefix: string;
   redisKey: string; // Redis Hash key
   database: number;
-  timeoutMs: number;
   querySize: number;
   filterKeys: (key: string) => boolean;
   resyncIntervalMs?: number;
@@ -39,7 +34,6 @@ export class SyncedMap<V> {
   private syncChannel: string;
   private redisKey: string;
   private database: number;
-  private timeoutMs: number;
   private querySize: number;
   private filterKeys: (key: string) => boolean;
   private resyncIntervalMs?: number;
@@ -54,7 +48,6 @@ export class SyncedMap<V> {
     this.redisKey = options.redisKey;
     this.syncChannel = `${options.keyPrefix}${SYNC_CHANNEL_SUFFIX}${options.redisKey}`;
     this.database = options.database;
-    this.timeoutMs = options.timeoutMs;
     this.querySize = options.querySize;
     this.filterKeys = options.filterKeys;
     this.resyncIntervalMs = options.resyncIntervalMs;
@@ -89,11 +82,22 @@ export class SyncedMap<V> {
 
     try {
       do {
-        const remoteItems = await this.client.hScan(
-          getTimeoutRedisCommandOptions(this.timeoutMs),
-          this.keyPrefix + this.redisKey,
-          cursor,
-          hScanOptions,
+        const remoteItems = await redisErrorHandler(
+          'SyncedMap.initialSync(), operation: hScan ' +
+            this.syncChannel +
+            ' ' +
+            this.keyPrefix +
+            ' ' +
+            this.redisKey +
+            ' ' +
+            cursor +
+            ' ' +
+            this.querySize,
+          this.client.hScan(
+            this.keyPrefix + this.redisKey,
+            cursor,
+            hScanOptions,
+          ),
         );
         for (const { field, value } of remoteItems.tuples) {
           if (this.filterKeys(field)) {
@@ -118,10 +122,10 @@ export class SyncedMap<V> {
     let remoteKeys: string[] = [];
     try {
       do {
-        const remoteKeysPortion = await this.client.scan(
-          getTimeoutRedisCommandOptions(this.timeoutMs),
-          cursor,
-          scanOptions,
+        const remoteKeysPortion = await redisErrorHandler(
+          'SyncedMap.cleanupKeysNotInRedis(), operation: scan ' +
+            this.keyPrefix,
+          this.client.scan(cursor, scanOptions),
         );
         remoteKeys = remoteKeys.concat(remoteKeysPortion.keys);
         cursor = remoteKeysPortion.cursor;
@@ -306,20 +310,15 @@ export class SyncedMap<V> {
       return;
     }
     if (!this.customizedSync?.withoutRedisHashmap) {
-      const options = getTimeoutRedisCommandOptions(this.timeoutMs);
       operations.push(
         redisErrorHandler(
           'SyncedMap.set(), operation: hSet ' +
             this.syncChannel +
             ' ' +
-            this.timeoutMs +
-            'ms' +
-            ' ' +
             this.keyPrefix +
             ' ' +
             key,
           this.client.hSet(
-            options,
             this.keyPrefix + this.redisKey,
             key as unknown as string,
             JSON.stringify(value),
@@ -338,9 +337,6 @@ export class SyncedMap<V> {
         'SyncedMap.set(), operation: publish ' +
           this.syncChannel +
           ' ' +
-          this.timeoutMs +
-          'ms' +
-          ' ' +
           this.keyPrefix +
           ' ' +
           key,
@@ -369,21 +365,17 @@ export class SyncedMap<V> {
     }
 
     if (!this.customizedSync?.withoutRedisHashmap) {
-      const options = getTimeoutRedisCommandOptions(this.timeoutMs * 10);
       operations.push(
         redisErrorHandler(
           'SyncedMap.delete(), operation: hDel ' +
             this.syncChannel +
             ' ' +
-            this.timeoutMs +
-            'ms' +
-            ' ' +
             this.keyPrefix +
             ' ' +
             this.redisKey +
             ' ' +
             keysArray,
-          this.client.hDel(options, this.keyPrefix + this.redisKey, keysArray),
+          this.client.hDel(this.keyPrefix + this.redisKey, keysArray),
         ),
       );
     }
@@ -398,9 +390,6 @@ export class SyncedMap<V> {
           'SyncedMap.delete(), operation: publish ' +
             this.syncChannel +
             ' ' +
-            this.timeoutMs +
-            'ms' +
-            ' ' +
             this.keyPrefix +
             ' ' +
             keysArray,