chore: upgrade ioredis to v5

mike-marcacci · Jan 30, 2023 · 7b1b9c4 · 7b1b9c4
1 parent dc7bcd9
commit 7b1b9c4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -45,15 +45,14 @@
     ]
   },
   "devDependencies": {
-    "@types/ioredis": "^4.28.8",
     "@types/node": "^17.0.21",
     "@typescript-eslint/eslint-plugin": "^5.13.0",
     "@typescript-eslint/parser": "^5.13.0",
     "ava": "^4.1.0",
     "eslint": "^8.10.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "ioredis": "^4.28.5",
+    "ioredis": "^5.2.3",
     "nodemon": "^2.0.15",
     "prettier": "^2.5.1",
     "typescript": "~4.6.2"

diff --git a/src/index.ts b/src/index.ts
@@ -552,11 +552,7 @@ export default class Redlock extends EventEmitter {
       let result: number;
       try {
         // Attempt to evaluate the script by its hash.
-        const shaResult = (await client.evalsha(script.hash, keys.length, [
-          ...keys,
-          ...args,
-        ])) as unknown;
-
+        const shaResult = await client.evalsha(script.hash, keys.length, ...keys, ...args);
         if (typeof shaResult !== "number") {
           throw new Error(
             `Unexpected result of type ${typeof shaResult} returned from redis.`
@@ -573,10 +569,7 @@ export default class Redlock extends EventEmitter {
         ) {
           throw error;
         }
-        const rawResult = (await client.eval(script.value, keys.length, [
-          ...keys,
-          ...args,
-        ])) as unknown;
+        const rawResult = await client.eval(script.value, keys.length, ...keys, ...args);
 
         if (typeof rawResult !== "number") {
           throw new Error(

diff --git a/src/multi.test.ts b/src/multi.test.ts
@@ -34,7 +34,7 @@ ${(await Promise.all(error.attempts))
 async function waitForCluster(redis: Cluster): Promise<void> {
   async function checkIsReady(): Promise<boolean> {
     return (
-      ((await redis.cluster("info")) as string).match(
+      ((await redis.cluster("INFO")) as string).match(
         /^cluster_state:(.+)$/m
       )?.[1] === "ok"
     );

diff --git a/src/single.test.ts b/src/single.test.ts
@@ -34,7 +34,7 @@ ${(await Promise.all(error.attempts))
 async function waitForCluster(redis: Cluster): Promise<void> {
   async function checkIsReady(): Promise<boolean> {
     return (
-      ((await redis.cluster("info")) as string).match(
+      ((await redis.cluster("INFO")) as string).match(
         /^cluster_state:(.+)$/m
       )?.[1] === "ok"
     );