fix: Remove unnecessary merging of AbortSignal to avoid overhead

neet · neet · commit 896764329a90 · 2024-04-27T21:11:01.000+09:00
diff --git a/src/adapters/config/http-config.ts b/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);
   }
 }
diff --git a/src/adapters/http/http-native-impl.ts b/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 });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,9 @@ export interface MastoHttpConfigProps {`
`16`	`16`	`readonly accessToken?: string;`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * Timeout configuration`
	`19`	`+ * Timeout milliseconds for the fetch request.`
`20`	`20`	`*`
`21`		`- * - A number sets the timeout in milliseconds.`
`22`		`- *`
`23`		`- * Defaults to 1000 * 300 = 300 seconds.`
	`21`	`+ * Defaults to browser's default timeout.`
`24`	`22`	`*/`
`25`	`23`	`readonly timeout?: number;`
`26`	`24`
`@@ -95,6 +93,6 @@ export class HttpConfigImpl implements HttpConfig {`
`95`	`93`	`signals.push(signal);`
`96`	`94`	`}`
`97`	`95`
`98`		`- return mergeAbortSignals(signals);`
	`96`	`+ return signals.length === 1 ? signals[0] : mergeAbortSignals(signals);`
`99`	`97`	`}`
`100`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,9 @@ export class HttpNativeImpl extends BaseHttp implements Http {`
`115`	`115`	`);`
`116`	`116`	`}`
`117`	`117`
	`118`	+ // TODO: Remove this handling when `AbortSignal.any` is shipped
`118`	`119`	`// eslint-disable-next-line @typescript-eslint/no-explicit-any`
`119`		`- if (error != undefined && (error as any).name === "AbortError") {`
	`120`	`+ if (error != undefined && (error as any).name === "TimeoutError") {`
`120`	`121`	return new MastoTimeoutError(`Request timed out`, { cause: error });
`121`	`122`	`}`
`122`	`123`