refactor: use AbortSignal.any() for mergeAbortSignals

Author: easonliang28

src/api/providers/__tests__/request-config-builder.spec.ts

@@ -298,19 +298,21 @@ describe("RequestConfigBuilder", () => {
 	})
 
 	describe("static mergeAbortSignals", () => {
-		test("should return primarySignal when secondarySignal is undefined", () => {
+		test("should return merged signal when secondarySignal is undefined", () => {
 			const controller = new AbortController()
 			const result = RequestConfigBuilder.mergeAbortSignals(controller.signal)
-			expect(result).toBe(controller.signal)
+			// AbortSignal.any() always returns a new signal
+			expect(result).not.toBe(controller.signal)
+			expect(result.aborted).toBe(false)
 		})
 
-		test("should return primarySignal when secondarySignal is already aborted", () => {
+		test("should return merged signal when secondarySignal is already aborted", () => {
 			const primaryController = new AbortController()
 			const secondaryController = new AbortController()
 			secondaryController.abort()
 
 			const result = RequestConfigBuilder.mergeAbortSignals(primaryController.signal, secondaryController.signal)
-			expect(result).toBe(primaryController.signal)
+			expect(result.aborted).toBe(true)
 		})
 
 		test("should return merged signal when both signals are active", () => {
@@ -320,6 +322,7 @@ describe("RequestConfigBuilder", () => {
 			const result = RequestConfigBuilder.mergeAbortSignals(primaryController.signal, secondaryController.signal)
 			expect(result).not.toBe(primaryController.signal)
 			expect(result).not.toBe(secondaryController.signal)
+			expect(result.aborted).toBe(false)
 		})
 
 		test("should abort merged signal when primarySignal is aborted", async () => {

src/api/providers/config-builder/request-config-builder.ts

@@ -108,28 +108,20 @@ export class RequestConfigBuilder<TOptions extends Record<string, any> = Record<
 	}
 
 	/**
-	 * Merge multiple abort signals.
+	 * Merge multiple abort signals using the standard API.
 	 *
-	 * If any signal is aborted, the returned signal will be aborted.
+	 * Uses `AbortSignal.any()` which correctly handles the case where
+	 * any signal is already aborted.
 	 *
 	 * @param primarySignal - The primary abort signal
 	 * @param secondarySignal - Optional secondary abort signal
-	 * @returns A merged AbortSignal
+	 * @returns A merged AbortSignal that aborts when any input signal aborts
 	 */
 	static mergeAbortSignals(primarySignal: AbortSignal, secondarySignal?: AbortSignal): AbortSignal {
-		if (!secondarySignal || secondarySignal.aborted) {
-			return primarySignal
+		if (!secondarySignal) {
+			return AbortSignal.any([primarySignal])
 		}
 
-		if (primarySignal.aborted) {
-			return primarySignal
-		}
-
-		const controller = new AbortController()
-
-		primarySignal.addEventListener("abort", () => controller.abort(), { once: true })
-		secondarySignal.addEventListener("abort", () => controller.abort(), { once: true })
-
-		return controller.signal
+		return AbortSignal.any([primarySignal, secondarySignal])
 	}
 }