support redis 5

Author: AmrSaber

package-lock.json

@@ -21,17 +21,17 @@
   "repository": "https://github.com/AmrSaber/simple-redis-mutex",
   "license": "ISC",
   "peerDependencies": {
-    "redis": ">=4.7.0"
+    "redis": ">=5.0.0"
   },
   "devDependencies": {
     "@types/jest": "^26.0.24",
-    "@types/redis": "^4.0.10",
     "eslint": "^7.25.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.22.1",
     "jest": "^29.7.0",
     "prettier": "^3.0.3",
+    "redis": "^5.0.1",
     "ts-jest": "^29.2.5",
     "typescript": "^5.7.2"
   },

package.json

@@ -1,6 +1,6 @@
 import { RedisClientType, RedisClusterType } from 'redis';
 
-type RedisClient = RedisClientType<any, any, any> | RedisClusterType<any, any, any>;
+type RedisClient = RedisClientType<any, any, any, any> | RedisClusterType<any, any, any, any>;
 
 type ReleaseCallbackFn = () => void;
 type ReleaseCallback = { lockKey: string; callback: ReleaseCallbackFn };
@@ -198,7 +198,7 @@ async function listenForUpdates(redis: RedisClient) {
 
   redis.on('end', async () => {
     await subscriber?.unsubscribe(REDIS_RELEASES_CHANNEL);
-    await subscriber?.quit();
+    await subscriber?.close();
     subscriber = undefined;
   });
 }
@@ -208,7 +208,6 @@ function getLockKey(lockName: string): string {
 }
 
 function isRedisClient(redis: RedisClient): redis is RedisClientType<any, any, any> {
-  // @ts-expect-error script load does not exist on redis cluster
   return typeof redis.scriptLoad == 'function';
 }
 

src/index.ts

@@ -2,7 +2,7 @@ import { createClient, RedisClientType } from 'redis';
 import { lock, LockOptions, tryLock, TryLockOptions } from './src';
 
 describe('Lock tests', () => {
-  let redis: RedisClientType<any, any, any>;
+  let redis: RedisClientType<any, any, any, any>;
   const lockName = '_test_lock';
 
   function sleep(millis?: number): Promise<void> {
@@ -11,7 +11,7 @@ describe('Lock tests', () => {
 
   beforeAll(async () => {
     redis = await createClient({ url: process.env.REDIS_URI })
-      .on('error', (err) => console.log('Redis Client Error', err))
+      .on('error', (err) => console.error('Redis Client Error', err))
       .connect();
 
     await redis.select(7); // So that main db is not updated and later flushed
@@ -52,6 +52,7 @@ describe('Lock tests', () => {
       [hasLock, release] = await tryLock(redis, lockName);
       expect(hasLock).toEqual(true);
 
+      // @ts-ignore
       redis.scriptLoad = scriptLoad;
     });