feat(xhr-http-handler): add support for per-request/per-operation timeouts

Author: siddsriv

packages/xhr-http-handler/src/xhr-http-handler.spec.ts

@@ -244,4 +244,37 @@ describe(XhrHttpHandler.name, () => {
       ["getAllResponseHeaders"],
     ]);
   });
+
+  describe("per-request requestTimeout", () => {
+    it("should use per-request timeout over handler config timeout", () => {
+      const handler1 = new XhrHttpHandler({ requestTimeout: 5000 });
+      const handler2 = new XhrHttpHandler({ requestTimeout: 200 });
+
+      const testTimeout = (handlerTimeout: number, requestTimeout?: number) => {
+        const expectedTimeout = Number(requestTimeout ?? handlerTimeout) | 0;
+        return expectedTimeout;
+      };
+
+      // per-request timeout takes precedence
+      expect(testTimeout(5000, 100)).toBe(100);
+
+      // fallback to handler config timeout
+      expect(testTimeout(200, undefined)).toBe(200);
+      expect(testTimeout(200)).toBe(200);
+    });
+
+    it("should pass correct timeout values to internal functions", async () => {
+      const handler = new XhrHttpHandler({ requestTimeout: 5000 });
+      (handler as any).config = { requestTimeout: 5000 };
+
+      const options1 = { requestTimeout: 100 };
+      const options2: { requestTimeout?: number } = {};
+
+      const effectiveTimeout1 = Number(options1.requestTimeout ?? (handler as any).config.requestTimeout) | 0;
+      const effectiveTimeout2 = Number(options2.requestTimeout ?? (handler as any).config.requestTimeout) | 0;
+
+      expect(effectiveTimeout1).toBe(100); // per-request timeout used
+      expect(effectiveTimeout2).toBe(5000); // handler config timeout used
+    });
+  });
 });

packages/xhr-http-handler/src/xhr-http-handler.ts

@@ -3,7 +3,7 @@ import { buildQueryString } from "@smithy/querystring-builder";
 import { HttpHandlerOptions, Provider } from "@smithy/types";
 import { EventEmitter } from "events";
 
-import { requestTimeout } from "./request-timeout";
+import { requestTimeout as requestTimeoutFn } from "./request-timeout";
 
 /**
  * Represents the http options that can be passed to the xhr http client.
@@ -114,12 +114,12 @@ export class XhrHttpHandler extends EventEmitter implements HttpHandler<XhrHttpH
 
   public async handle(
     request: HttpRequest,
-    { abortSignal }: HttpHandlerOptions = {}
+    { abortSignal, requestTimeout }: HttpHandlerOptions = {}
   ): Promise<{ response: HttpResponse }> {
     if (!this.config) {
       this.config = await this.configProvider;
     }
-    const requestTimeoutInMs = Number(this.config!.requestTimeout) | 0;
+    const requestTimeoutInMs = Number(requestTimeout ?? this.config!.requestTimeout) | 0;
 
     // if the request was already aborted, prevent doing extra work
     if (abortSignal?.aborted) {
@@ -214,7 +214,7 @@ export class XhrHttpHandler extends EventEmitter implements HttpHandler<XhrHttpH
         this.emit(EVENTS.BEFORE_XHR_SEND, xhr);
         xhr.send(body);
       }),
-      requestTimeout(requestTimeoutInMs),
+      requestTimeoutFn(requestTimeoutInMs),
     ];
     let removeSignalEventListener = () => {};
     if (abortSignal) {