use request timeout and TLS settings from Sender options in '/settings' fetch()

Author: glasstiger

src/options.ts

@@ -1,10 +1,12 @@
+import { readFileSync } from "node:fs";
 import { PathOrFileDescriptor } from "fs";
 import { Agent } from "undici";
 import http from "http";
 import https from "https";
 
 import { Logger } from "./logging";
-import { fetchJson } from "./utils";
+import { fetchJson, isBoolean, isInteger } from "./utils";
+import { DEFAULT_REQUEST_TIMEOUT } from "./transport/http/base";
 
 const HTTP_PORT = 9000;
 const TCP_PORT = 9009;
@@ -235,7 +237,20 @@ class SenderOptions {
     const url = `${options.protocol}://${options.host}:${options.port}/settings`;
     const settings: {
       config: { LINE_PROTO_SUPPORT_VERSION: number[] };
-    } = await fetchJson(url);
+    } = await fetchJson(
+      url,
+      isInteger(options.request_timeout, 1)
+        ? options.request_timeout
+        : DEFAULT_REQUEST_TIMEOUT,
+      new Agent({
+        connect: {
+          ca: options.tls_ca ? readFileSync(options.tls_ca) : undefined,
+          rejectUnauthorized: isBoolean(options.tls_verify)
+            ? options.tls_verify
+            : true,
+        },
+      }),
+    );
     const supportedVersions: string[] = (
       settings.config[LINE_PROTO_SUPPORT_VERSION] ?? []
     ).map((version: unknown) => String(version));

src/transport/http/base.ts

@@ -135,4 +135,9 @@ abstract class HttpTransportBase implements SenderTransport {
   abstract send(data: Buffer): Promise<boolean>;
 }
 
-export { HttpTransportBase, RETRIABLE_STATUS_CODES, HTTP_NO_CONTENT };
+export {
+  HttpTransportBase,
+  RETRIABLE_STATUS_CODES,
+  HTTP_NO_CONTENT,
+  DEFAULT_REQUEST_TIMEOUT,
+};

src/utils.ts

@@ -1,3 +1,5 @@
+import { Agent } from "undici";
+
 type TimestampUnit = "ns" | "us" | "ms";
 
 function isBoolean(value: unknown): value is boolean {
@@ -40,13 +42,26 @@ function timestampToNanos(timestamp: bigint, unit: TimestampUnit) {
  * Fetches JSON data from a URL.
  * @template T - The expected type of the JSON response
  * @param url - The URL to fetch from
+ * @param agent - HTTP agent to be used for the request
+ * @param timeout - Request timeout, query will be aborted if not finished in time
  * @returns Promise resolving to the parsed JSON data
  * @throws Error if the request fails or returns a non-OK status
  */
-async function fetchJson<T>(url: string): Promise<T> {
+async function fetchJson<T>(
+  url: string,
+  timeout: number,
+  agent: Agent,
+): Promise<T> {
+  const controller = new AbortController();
+  const { signal } = controller;
+  setTimeout(() => controller.abort(), timeout);
+
   let response: globalThis.Response;
   try {
-    response = await fetch(url);
+    response = await fetch(url, {
+      dispatcher: agent,
+      signal,
+    });
   } catch (error) {
     throw new Error(`Failed to load ${url} [error=${error}]`);
   }

test/options.test.ts

@@ -281,7 +281,7 @@ describe("Configuration string parser suite", function () {
     );
     expect(options.protocol_version).toBe("2");
     options = await SenderOptions.fromConfig(
-      `https::addr=localhost:${MOCK_HTTPS_PORT}`,
+      `https::addr=localhost:${MOCK_HTTPS_PORT};tls_verify=unsafe_off`,
     );
     expect(options.protocol_version).toBe("2");
 
@@ -302,7 +302,7 @@ describe("Configuration string parser suite", function () {
     );
     expect(options.protocol_version).toBe("1");
     options = await SenderOptions.fromConfig(
-      `https::addr=localhost:${MOCK_HTTPS_PORT}`,
+      `https::addr=localhost:${MOCK_HTTPS_PORT};tls_verify=unsafe_off`,
     );
     expect(options.protocol_version).toBe("1");
 
@@ -323,7 +323,7 @@ describe("Configuration string parser suite", function () {
     );
     expect(options.protocol_version).toBe("1");
     options = await SenderOptions.fromConfig(
-      `https::addr=localhost:${MOCK_HTTPS_PORT}`,
+      `https::addr=localhost:${MOCK_HTTPS_PORT};tls_verify=unsafe_off`,
     );
     expect(options.protocol_version).toBe("1");
 
@@ -342,15 +342,15 @@ describe("Configuration string parser suite", function () {
     await expect(
       async () =>
         await SenderOptions.fromConfig(
-          `http::addr=localhost:${MOCK_HTTP_PORT}`,
+          `http::addr=localhost:${MOCK_HTTP_PORT};tls_verify=unsafe_off`,
         ),
     ).rejects.toThrow(
       "Unsupported protocol versions received from server: 3,5",
     );
     await expect(
       async () =>
         await SenderOptions.fromConfig(
-          `https::addr=localhost:${MOCK_HTTPS_PORT}`,
+          `https::addr=localhost:${MOCK_HTTPS_PORT};tls_verify=unsafe_off`,
         ),
     ).rejects.toThrow(
       "Unsupported protocol versions received from server: 3,5",
@@ -407,7 +407,7 @@ describe("Configuration string parser suite", function () {
     );
     expect(options.protocol_version).toBe("2");
     options = await SenderOptions.fromConfig(
-      `https::addr=localhost:${MOCK_HTTPS_PORT};protocol_version=auto`,
+      `https::addr=localhost:${MOCK_HTTPS_PORT};tls_verify=unsafe_off;protocol_version=auto`,
     );
     expect(options.protocol_version).toBe("2");
   });