Merge remote-tracking branch 'refs/remotes/origin/master'

Author: watersRand

.github/workflows/tests.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         node-version: ["18", "20", "22"]
-        redis-version: ["rs-7.4.0-v1", "8.0.2", "8.2-rc1"]
+        redis-version: ["rs-7.4.0-v1", "8.0.2", "8.2"]
     steps:
       - uses: actions/checkout@v4
         with:

README.md

@@ -241,7 +241,7 @@ Node Redis v5 adds support for [Client Side Caching](https://redis.io/docs/manua
 ```typescript
 // Enable client side caching with RESP3
 const client = createClient({
-  RESP: 3, 
+  RESP: 3,
   clientSideCache: {
     ttl: 0,             // Time-to-live (0 = no expiration)
     maxEntries: 0,      // Maximum entries (0 = unlimited)
@@ -304,6 +304,7 @@ Node Redis is supported with the following versions of Redis:
 
 | Version | Supported          |
 | ------- | ------------------ |
+| 8.2.z   | :heavy_check_mark: |
 | 8.0.z   | :heavy_check_mark: |
 | 7.4.z   | :heavy_check_mark: |
 | 7.2.z   | :heavy_check_mark: |

package-lock.json

@@ -4,7 +4,7 @@ import RedisBloomModules from '.';
 export default  TestUtils.createFromConfig({
   dockerImageName: 'redislabs/client-libs-test',
   dockerImageVersionArgument: 'redis-version',
-  defaultDockerVersion: '8.2-rc1'
+  defaultDockerVersion: '8.2'
 });
 
 export const GLOBAL = {

packages/bloom/lib/test-utils.ts

@@ -1,6 +1,6 @@
 {
   "name": "@redis/bloom",
-  "version": "5.7.0",
+  "version": "5.8.0",
   "license": "MIT",
   "main": "./dist/lib/index.js",
   "types": "./dist/lib/index.d.ts",
@@ -13,7 +13,7 @@
     "release": "release-it"
   },
   "peerDependencies": {
-    "@redis/client": "^5.7.0"
+    "@redis/client": "^5.8.0"
   },
   "devDependencies": {
     "@redis/test-utils": "*"

packages/bloom/package.json

@@ -64,7 +64,8 @@ describe('Client', () => {
       const expected: RedisClientOptions = {
         socket: {
           host: 'localhost',
-          port: 6379
+          port: 6379,
+          tls: false
         },
         username: 'user',
         password: 'secret',
@@ -161,12 +162,58 @@ describe('Client', () => {
         {
           socket: {
             host: 'localhost',
+            tls: false
           }
         }
       );
     });
   });
 
+  describe('parseOptions', () => {
+    it('should throw error if tls socket option is set to true and the url protocol is "redis:"', () => {
+      assert.throws(
+        () => RedisClient.parseOptions({
+          url: 'redis://localhost',
+          socket: {
+            tls: true
+          }
+        }),
+        TypeError
+      );
+    });
+    it('should throw error if tls socket option is set to false and the url protocol is "rediss:"', () => {
+      assert.throws(
+        () => RedisClient.parseOptions({
+          url: 'rediss://localhost',
+          socket: {
+            tls: false
+          }
+        }),
+        TypeError
+      );
+    });
+    it('should not throw when tls socket option and url protocol matches"', () => {
+      assert.equal(
+        RedisClient.parseOptions({
+          url: 'rediss://localhost',
+          socket: {
+            tls: true
+          }
+        }).socket.tls,
+        true
+      );
+      assert.equal(
+        RedisClient.parseOptions({
+          url: 'redis://localhost',
+          socket: {
+            tls: false
+          }
+        }).socket.tls,
+        false
+      );
+    });
+  });
+
   describe('authentication', () => {
     testUtils.testWithClient('Client should be authenticated', async client => {
       assert.equal(

packages/client/lib/client/index.spec.ts

@@ -315,21 +315,45 @@ export default class RedisClient<
     return RedisClient.factory(options)(options);
   }
 
-  static parseURL(url: string): RedisClientOptions {
+  static parseOptions<O extends RedisClientOptions>(options: O): O {
+    if (options?.url) {
+      const parsed = RedisClient.parseURL(options.url);
+      if (options.socket) {
+        if (options.socket.tls !== undefined && options.socket.tls !== parsed.socket.tls) {
+          throw new TypeError(`tls socket option is set to ${options.socket.tls} which is mismatch with protocol or the URL ${options.url} passed`)
+        }
+        parsed.socket = Object.assign(options.socket, parsed.socket);
+      }
+
+      Object.assign(options, parsed);
+    }
+    return options;
+  }
+
+  static parseURL(url: string): RedisClientOptions & {
+    socket: Exclude<RedisClientOptions['socket'], undefined> & {
+      tls: boolean
+    }
+  } {
     // https://www.iana.org/assignments/uri-schemes/prov/redis
     const { hostname, port, protocol, username, password, pathname } = new URL(url),
-      parsed: RedisClientOptions = {
+      parsed: RedisClientOptions & {
+        socket: Exclude<RedisClientOptions['socket'], undefined> & {
+          tls: boolean
+        }
+      } = {
         socket: {
-          host: hostname
+          host: hostname,
+          tls: false
         }
       };
 
-    if (protocol === 'rediss:') {
-      parsed!.socket!.tls = true;
-    } else if (protocol !== 'redis:') {
+    if (protocol !== 'redis:' && protocol !== 'rediss:') {
       throw new TypeError('Invalid protocol');
     }
 
+    parsed.socket.tls = protocol === 'rediss:';
+
     if (port) {
       (parsed.socket as TcpSocketConnectOpts).port = Number(port);
     }
@@ -464,15 +488,6 @@ export default class RedisClient<
       };
     }
 
-    if (options?.url) {
-      const parsed = RedisClient.parseURL(options.url);
-      if (options.socket) {
-        parsed.socket = Object.assign(options.socket, parsed.socket);
-      }
-
-      Object.assign(options, parsed);
-    }
-
     if (options?.database) {
       this._self.#selectedDB = options.database;
     }
@@ -481,6 +496,10 @@ export default class RedisClient<
       this._commandOptions = options.commandOptions;
     }
 
+    if (options) {
+      return RedisClient.parseOptions(options);
+    }
+
     return options;
   }
 

packages/client/lib/client/index.ts

@@ -2,7 +2,6 @@ import { CommandParser } from '../client/parser';
 import { RedisArgument, NumberReply, Command } from '../RESP/types';
 
 export default {
-  IS_READ_ONLY: true,
   /**
    * Sets a timeout on key. After the timeout has expired, the key will be automatically deleted
    * @param parser - The Redis command parser

packages/client/lib/commands/EXPIRE.ts

@@ -3,7 +3,6 @@ import { RedisArgument, NumberReply, Command } from '../RESP/types';
 import { transformEXAT } from './generic-transformers';
 
 export default {
-  IS_READ_ONLY: true,
   /**
    * Sets the expiration for a key at a specific Unix timestamp
    * @param parser - The Redis command parser