pass abort signal

Author: florian-schunk

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

@@ -263,6 +263,23 @@ describe('Client', () => {
           AbortError
         );
       }, GLOBAL.SERVERS.OPEN);
+
+      testUtils.testWithClient('AbortError with timeout', client => {
+        const controller = new AbortController();
+        controller.abort();
+
+        return assert.rejects(
+          client.sendCommand(['PING'], {
+            abortSignal: controller.signal
+          }),
+          AbortError
+        );
+      }, {
+        ...GLOBAL.SERVERS.OPEN,
+        clientOptions: {
+          commandTimeout: 50,
+        }
+      });
     });
 
   testUtils.testWithClient('CommandTimeoutError', async client => {

packages/client/lib/client/index.ts

@@ -896,9 +896,16 @@ export default class RedisClient<
     let controller: AbortController;
     if (this._self.#options?.commandTimeout) {
       controller = new AbortController()
+      let abortSignal = controller.signal;
+      if (options?.abortSignal) {
+        abortSignal = AbortSignal.any([
+          abortSignal,
+	  options.abortSignal
+	]);
+      }
       options = {
         ...options,
-        abortSignal: controller.signal
+        abortSignal
       }
     }
     const promise = this._self.#queue.addCommand<T>(args, options);