Merge pull request #1101 from neet/remove-unneeded-signal-merging

fix: Remove unnecessary merging of AbortSignal to avoid overhead

src/adapters/config/http-config.ts

@@ -16,11 +16,9 @@ export interface MastoHttpConfigProps {
   readonly accessToken?: string;
 
   /**
-   * Timeout configuration
+   * Timeout milliseconds for the fetch request.
    *
-   * - A number sets the timeout in milliseconds.
-   *
-   * Defaults to 1000 * 300 = 300 seconds.
+   * Defaults to browser's default timeout.
    */
   readonly timeout?: number;
 
@@ -95,6 +93,6 @@ export class HttpConfigImpl implements HttpConfig {
       signals.push(signal);
     }
 
-    return mergeAbortSignals(signals);
+    return signals.length === 1 ? signals[0] : mergeAbortSignals(signals);
   }
 }

src/adapters/http/http-native-impl.ts

@@ -115,8 +115,9 @@ export class HttpNativeImpl extends BaseHttp implements Http {
       );
     }
 
+    // TODO: Remove this handling when `AbortSignal.any` is shipped
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    if (error != undefined && (error as any).name === "AbortError") {
+    if (error != undefined && (error as any).name === "TimeoutError") {
       return new MastoTimeoutError(`Request timed out`, { cause: error });
     }