@podium/client 5.1.9 → 5.1.10-next.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [5.1.10-next.1](https://github.com/podium-lib/client/compare/v5.1.9...v5.1.10-next.1) (2024-08-22)
+
+
+### Bug Fixes
+
+* use AbortSignal to ensure timeouts are respected ([08899d9](https://github.com/podium-lib/client/commit/08899d974246037cb1893a5b6d06bd6df58815e2))
+
 ## [5.1.9](https://github.com/podium-lib/client/compare/v5.1.8...v5.1.9) (2024-08-19)
 
 

package/lib/http.js

@@ -1,4 +1,4 @@
-import { request } from 'undici';
+import { request as undiciRequest } from 'undici';
 
 /**
  * @typedef {object} PodiumHttpClientRequestOptions
@@ -7,21 +7,27 @@ import { request } from 'undici';
  * @property {boolean} [rejectUnauthorized]
  * @property {boolean} [follow]
  * @property {number} [timeout]
- * @property {number} [bodyTimeout]
  * @property {object} [query]
  * @property {import('http').IncomingHttpHeaders} [headers]
  */
 
 export default class HTTP {
+    constructor(requestFn = undiciRequest) {
+        this.requestFn = requestFn;
+    }
+
     /**
      * @param {string} url
      * @param {PodiumHttpClientRequestOptions} options
      * @returns {Promise<Pick<import('undici').Dispatcher.ResponseData, 'statusCode' | 'headers' | 'body'>>}
      */
     async request(url, options) {
-        const { statusCode, headers, body } = await request(
+        const { statusCode, headers, body } = await this.requestFn(
             new URL(url),
-            options,
+            {
+                ...options,
+                signal: AbortSignal.timeout(options.timeout || 1000),
+            },
         );
         return { statusCode, headers, body };
     }

package/lib/resolver.content.js

@@ -136,7 +136,7 @@ export default class PodletClientContentResolver {
         /** @type {import('./http.js').PodiumHttpClientRequestOptions} */
         const reqOptions = {
             rejectUnauthorized: outgoing.rejectUnauthorized,
-            bodyTimeout: outgoing.timeout,
+            timeout: outgoing.timeout,
             method: 'GET',
             query: outgoing.reqOptions.query,
             headers,
@@ -267,6 +267,7 @@ export default class PodletClientContentResolver {
                 }),
             );
 
+            // @ts-ignore
             pipeline([body, outgoing], (err) => {
                 if (err) {
                     this.#log.warn('error while piping content stream', err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podium/client",
-  "version": "5.1.9",
+  "version": "5.1.10-next.1",
   "type": "module",
   "license": "MIT",
   "keywords": [

package/types/http.d.ts

@@ -5,11 +5,12 @@
  * @property {boolean} [rejectUnauthorized]
  * @property {boolean} [follow]
  * @property {number} [timeout]
- * @property {number} [bodyTimeout]
  * @property {object} [query]
  * @property {import('http').IncomingHttpHeaders} [headers]
  */
 export default class HTTP {
+    constructor(requestFn?: typeof undiciRequest);
+    requestFn: typeof undiciRequest;
     /**
      * @param {string} url
      * @param {PodiumHttpClientRequestOptions} options
@@ -23,7 +24,7 @@ export type PodiumHttpClientRequestOptions = {
     rejectUnauthorized?: boolean;
     follow?: boolean;
     timeout?: number;
-    bodyTimeout?: number;
     query?: object;
     headers?: import('http').IncomingHttpHeaders;
 };
+import { request as undiciRequest } from 'undici';