@trayio/axios 5.16.0 → 5.17.0

package/dist/http/AxiosHttpClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AxiosHttpClient.d.ts","sourceRoot":"","sources":["../../src/http/AxiosHttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAEN,UAAU,EACV,WAAW,EAEX,YAAY,EAEZ,MAAM,2BAA2B,CAAC;AAWnC,OAAO,QAAQ,GAAG,QAAQ,WAAW,CAAC,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAMxD,KAAK,YAAY,GAAG;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAWF,qBAAa,eAAgB,YAAW,UAAU;IAMhD,OAAO,CAAC,QAAQ,CAAC,WAAW;IAL7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA8B;IAC5D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuB;gBAGrC,WAAW,GAAE,WAAqC,EACnE,YAAY,GAAE,YAAiB;IAgDhC,OAAO,CACN,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,WAAW,GAClB,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC;IAgHrC,OAAO,CAAC,wBAAwB;IAmBhC,OAAO,CAAC,2BAA2B;IAUnC,YAAY,aAAc,QAAQ,cAAc,OAAO,MAAM,EAAE,MAAM,CAAC,cAKpE;CACF"}
+{"version":3,"file":"AxiosHttpClient.d.ts","sourceRoot":"","sources":["../../src/http/AxiosHttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAEN,UAAU,EACV,WAAW,EAEX,YAAY,EAEZ,MAAM,2BAA2B,CAAC;AAWnC,OAAO,QAAQ,GAAG,QAAQ,WAAW,CAAC,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAMxD,KAAK,YAAY,GAAG;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAWF,qBAAa,eAAgB,YAAW,UAAU;IAMhD,OAAO,CAAC,QAAQ,CAAC,WAAW;IAL7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA8B;IAC5D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuB;gBAGrC,WAAW,GAAE,WAAqC,EACnE,YAAY,GAAE,YAAiB;IAgDhC,OAAO,CACN,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,WAAW,GAClB,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,YAAY,CAAC;IAsHrC,OAAO,CAAC,wBAAwB;IAmBhC,OAAO,CAAC,2BAA2B;IAUnC,YAAY,aAAc,QAAQ,cAAc,OAAO,MAAM,EAAE,MAAM,CAAC,cAKpE;CACF"}

package/dist/http/AxiosHttpClient.js

@@ -129,7 +129,7 @@ class AxiosHttpClient {
                 httpsAgent: axiosHttpsAgent,
                 params: request.queryString,
                 ...(this.resolvedOptions.followRedirects ? {} : { maxRedirects: 0 }),
-                timeout: this.resolvedOptions.timeout,
+                timeout: (0, function_1.pipe)(request.timeout ?? O.none, O.getOrElse(() => this.resolvedOptions.timeout)),
             };
             return (0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => this.axiosInstance(axiosConfig)
                 .then(this.axiosResponseToHttpResponse)
@@ -144,7 +144,7 @@ class AxiosHttpClient {
             httpsAgent: axiosHttpsAgent,
             params: request.queryString,
             ...(this.resolvedOptions.followRedirects ? {} : { maxRedirects: 0 }),
-            timeout: this.resolvedOptions.timeout,
+            timeout: (0, function_1.pipe)(request.timeout ?? O.none, O.getOrElse(() => this.resolvedOptions.timeout)),
         };
         return (0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => this.axiosInstance(axiosConfig)
             .then(this.axiosResponseToHttpResponse)

package/dist/http/AxiosHttpClient.unit.test.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const HttpClient_abstract_test_1 = require("@trayio/commons/http/HttpClient.abstract.test");
 const NodeFsFileStorage_1 = require("@trayio/commons/file/NodeFsFileStorage");
+const O = __importStar(require("fp-ts/Option"));
 const E = __importStar(require("fp-ts/Either"));
 const Http_1 = require("@trayio/commons/http/Http");
 const BufferExtensions_1 = require("@trayio/commons/buffer/BufferExtensions");
@@ -271,5 +272,88 @@ describe('AxiosHttpClient Tests', () => {
                 expect(response.right.statusCode).toBe(200);
             }
         });
+        test('should use per-request timeout when provided, overriding constructor timeout', async () => {
+            const axiosHttpClient = new AxiosHttpClient_1.AxiosHttpClient(new NodeFsFileStorage_1.NodeFsFileStorage(), {
+                rejectUnauthorized: false,
+                followRedirects: true,
+                timeout: 5000, // 5 second constructor-level timeout (long)
+            });
+            const testUrl = 'http://test-per-request-timeout.example.com';
+            // Mock a slow response (500ms delay)
+            (0, nock_1.default)(testUrl)
+                .get('/')
+                .delay(500) // 500ms delay
+                .reply(200, { success: true });
+            const response = await axiosHttpClient.execute(Http_1.HttpMethod.Get, testUrl, Http_1.HttpRequest.create({
+                headers: {},
+                pathParams: {},
+                queryString: {},
+                body: BufferExtensions_1.BufferExtensions.arrayBufferToReadable(new ArrayBuffer(0)),
+                timeout: O.some(50), // 50ms per-request timeout (short) - should override constructor timeout
+            }))();
+            // Should timeout because per-request timeout (50ms) is used instead of constructor timeout (5000ms)
+            expect(E.isRight(response)).toBe(true);
+            if (E.isRight(response)) {
+                // AxiosHttpClient converts timeout errors to 500 responses
+                expect(response.right.statusCode).toBe(500);
+            }
+        });
+        test('should use constructor timeout when per-request timeout is O.none', async () => {
+            const axiosHttpClient = new AxiosHttpClient_1.AxiosHttpClient(new NodeFsFileStorage_1.NodeFsFileStorage(), {
+                rejectUnauthorized: false,
+                followRedirects: true,
+                timeout: 50, // 50ms constructor-level timeout (short)
+            });
+            const testUrl = 'http://test-none-timeout.example.com';
+            // Mock a slow response (500ms delay)
+            (0, nock_1.default)(testUrl)
+                .get('/')
+                .delay(500) // 500ms delay
+                .reply(200, { success: true });
+            const response = await axiosHttpClient.execute(Http_1.HttpMethod.Get, testUrl, Http_1.HttpRequest.create({
+                headers: {},
+                pathParams: {},
+                queryString: {},
+                body: BufferExtensions_1.BufferExtensions.arrayBufferToReadable(new ArrayBuffer(0)),
+                timeout: O.none, // No per-request timeout - should use constructor timeout (50ms)
+            }))();
+            // Should timeout because constructor timeout (50ms) is used
+            expect(E.isRight(response)).toBe(true);
+            if (E.isRight(response)) {
+                // AxiosHttpClient converts timeout errors to 500 responses
+                expect(response.right.statusCode).toBe(500);
+            }
+        });
+        test('should use constructor timeout when timeout field is omitted (backward compatibility)', async () => {
+            const axiosHttpClient = new AxiosHttpClient_1.AxiosHttpClient(new NodeFsFileStorage_1.NodeFsFileStorage(), {
+                rejectUnauthorized: false,
+                followRedirects: true,
+                timeout: 50, // 50ms constructor-level timeout (short)
+            });
+            const testUrl = 'http://test-omitted-timeout.example.com';
+            // Mock a slow response (500ms delay)
+            (0, nock_1.default)(testUrl)
+                .get('/')
+                .delay(500) // 500ms delay
+                .reply(200, { success: true });
+            // Create request without timeout field (backward compatible with old code)
+            const request = {
+                headers: {},
+                pathParams: {},
+                queryString: {},
+                body: BufferExtensions_1.BufferExtensions.arrayBufferToReadable(new ArrayBuffer(0)),
+                headerOptions: O.none,
+                agent: O.none,
+                clientIp: O.none,
+                // timeout field omitted - should use constructor timeout (50ms)
+            };
+            const response = await axiosHttpClient.execute(Http_1.HttpMethod.Get, testUrl, request)();
+            // Should timeout because constructor timeout (50ms) is used
+            expect(E.isRight(response)).toBe(true);
+            if (E.isRight(response)) {
+                // AxiosHttpClient converts timeout errors to 500 responses
+                expect(response.right.statusCode).toBe(500);
+            }
+        });
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/axios",
-  "version": "5.16.0",
+  "version": "5.17.0",
   "description": "Axios extensions and implementations",
   "exports": {
     "./*": "./dist/*.js"
@@ -14,7 +14,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@trayio/commons": "5.16.0",
+    "@trayio/commons": "5.17.0",
     "axios": "1.13.5",
     "axios-retry": "4.5.0",
     "form-data": "4.0.4"