reuse AbortError

Author: florian-schunk

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

@@ -283,11 +283,11 @@ describe('Client', () => {
     });
 
   testUtils.testWithClient('CommandTimeoutError', async client => {
-    const promise = assert.rejects(client.sendCommand(['PING']), CommandTimeoutError),
-      start = process.hrtime.bigint();
+    const promise = assert.rejects(client.sendCommand(['PING']), AbortError);
+    const start = process.hrtime.bigint();
 
     while (process.hrtime.bigint() - start < 50_000_000) {
-      // block the event loop for 1ms, to make sure the connection will timeout
+      // block the event loop for 50ms, to make sure the connection will timeout
     }
 
     await promise;

packages/client/lib/client/index.ts

@@ -4,7 +4,7 @@ import { BasicAuth, CredentialsError, CredentialsProvider, StreamingCredentialsP
 import RedisCommandsQueue, { CommandOptions } from './commands-queue';
 import { EventEmitter } from 'node:events';
 import { attachConfig, functionArgumentsPrefix, getTransformReply, scriptArgumentsPrefix } from '../commander';
-import { ClientClosedError, ClientOfflineError, CommandTimeoutError, DisconnectsClientError, WatchError } from '../errors';
+import { ClientClosedError, ClientOfflineError, AbortError, DisconnectsClientError, WatchError } from '../errors';
 import { URL } from 'node:url';
 import { TcpSocketConnectOpts } from 'node:net';
 import { PUBSUB_TYPE, PubSubType, PubSubListener, PubSubTypeListeners, ChannelListeners } from './pub-sub';
@@ -918,7 +918,7 @@ export default class RedisClient<
     return new Promise<T>((resolve, reject) => {
       const timeoutId = setTimeout(() => {
         controller.abort();
-        reject(new CommandTimeoutError());
+        reject(new AbortError());
       }, this._self.#options?.commandTimeout)
       promise.then(result => {
         clearInterval(timeoutId);

packages/client/lib/errors.ts

@@ -22,12 +22,6 @@ export class SocketTimeoutError extends Error {
   }
 }
 
-export class CommandTimeoutError extends Error {
-  constructor() {
-    super('Command timeout');
-  }
-}
-
 export class ClientClosedError extends Error {
   constructor() {
     super('The client is closed');