fix: Change timeout: undefined to fall back to Fetch API default timeout

neet · neet · commit dfbaaa6577d1 · 2024-04-27T20:34:08.000+09:00
diff --git a/src/adapters/config/http-config.spec.ts b/src/adapters/config/http-config.spec.ts
@@ -76,6 +76,26 @@ describe("Config", () => {
     expect(request.signal.aborted).toBe(true);
   });
 
+  it("falls back to default timeout if timeout = undefined (#1097)", () => {
+    jest.spyOn(AbortSignal, "timeout");
+
+    const config = new HttpConfigImpl(
+      {
+        url: "https://mastodon.social",
+        accessToken: "token",
+      },
+      new SerializerNativeImpl(),
+    );
+
+    const requestInit = config.mergeRequestInitWithDefaults();
+    const request = new Request("https://example.com", requestInit);
+
+    expect(request.signal.aborted).toBe(false);
+    expect(AbortSignal.timeout).not.toHaveBeenCalled();
+
+    jest.restoreAllMocks();
+  });
+
   it("resolves HTTP path", () => {
     const config = new HttpConfigImpl(
       {
diff --git a/src/adapters/config/http-config.ts b/src/adapters/config/http-config.ts
@@ -2,8 +2,6 @@ import { type HttpConfig, type Serializer } from "../../interfaces";
 import { mergeAbortSignals } from "./merge-abort-signals";
 import { mergeHeadersInit } from "./merge-headers-init";
 
-const DEFAULT_TIMEOUT_MS = 1000 * 300;
-
 export interface MastoHttpConfigProps {
   /**
    * REST API URL for your Mastodon instance.
@@ -18,7 +16,9 @@ export interface MastoHttpConfigProps {
   readonly accessToken?: string;
 
   /**
-   * Timeout in milliseconds.
+   * Timeout configuration
+   *
+   * - A number sets the timeout in milliseconds.
    *
    * Defaults to 1000 * 300 = 300 seconds.
    */
@@ -64,10 +64,6 @@ export class HttpConfigImpl implements HttpConfig {
     return url;
   }
 
-  private createTimeout(): AbortSignal {
-    return AbortSignal.timeout(this.props.timeout ?? DEFAULT_TIMEOUT_MS);
-  }
-
   private mergeHeadersWithDefaults(override: HeadersInit = {}): Headers {
     const headersInit = mergeHeadersInit([
       this.props.requestInit?.headers ?? {},
@@ -85,8 +81,11 @@ export class HttpConfigImpl implements HttpConfig {
   private mergeAbortSignalWithDefaults(
     signal?: AbortSignal | null,
   ): AbortSignal {
-    const timeout = this.createTimeout();
-    const signals: AbortSignal[] = [timeout];
+    const signals: AbortSignal[] = [];
+
+    if (this.props.timeout != undefined) {
+      signals.push(AbortSignal.timeout(this.props.timeout));
+    }
 
     if (this.props.requestInit?.signal) {
       signals.push(this.props.requestInit.signal);
