balena-request 13.3.1 → 13.3.2

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,15 @@
+- commits:
+    - subject: Fix always following redirects when followRedirect = false
+      hash: 34db7e138eabfcfcfd822133b391c738d01de323
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+  version: 13.3.2
+  title: ""
+  date: 2024-07-12T08:40:03.970Z
 - commits:
     - subject: Update balena-auth to 6.0.1
       hash: 1d3cd469288f2dd0e1ed70a292778b70bd518528
@@ -10,7 +22,7 @@
       nested: []
   version: 13.3.1
   title: ""
-  date: 2024-02-23T10:45:59.451Z
+  date: 2024-02-23T10:50:39.931Z
 - commits:
     - subject: Increase TOKEN_REFRESH_INTERVAL from 1 hours to 1 day
       hash: b841794b35ef310f831a37df9003418e9b90c99a

package/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 13.3.2 - 2024-07-12
+
+* Fix always following redirects when followRedirect = false [Thodoris Greasidis]
+
 ## 13.3.1 - 2024-02-23
 
 * Update balena-auth to 6.0.1 [Thodoris Greasidis]

package/build/progress.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { BalenaRequestOptions, BalenaRequestResponse } from './request';
 import type { getRequestAsync } from './utils';
 import type * as Stream from 'stream';

package/build/progress.js

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.estimate = void 0;
+exports.estimate = estimate;
 const tslib_1 = require("tslib");
 const utils = require("./utils");
 /**
@@ -160,4 +160,3 @@ function estimate(requestAsync, isBrowser) {
         });
     };
 }
-exports.estimate = estimate;

package/build/request.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import type BalenaAuth from 'balena-auth';
 import type * as Stream from 'stream';
 import * as urlLib from 'url';
@@ -73,5 +71,5 @@ export declare function getRequest({ auth, debug, retries, isBrowser, intercepto
     send: <T = any>(options: BalenaRequestOptions) => Promise<BalenaRequestResponse<T>>;
     stream: (options: BalenaRequestOptions) => Promise<BalenaRequestStreamResult>;
     interceptors: Interceptor[];
-    refreshToken: ({ baseUrl, }: Pick<BalenaRequestOptions, 'baseUrl'>) => Promise<string>;
+    refreshToken: ({ baseUrl, }: Pick<BalenaRequestOptions, "baseUrl">) => Promise<string>;
 };

package/build/request.js

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRequest = void 0;
+exports.getRequest = getRequest;
 const tslib_1 = require("tslib");
 const urlLib = require("url");
 const errors = require("balena-errors");
@@ -328,8 +328,8 @@ function getRequest({ auth, debug = false, retries = 0, isBrowser = false, inter
      * request.refreshToken
      * 	baseUrl: 'https://api.balena-cloud.com'
      */
-    function refreshToken({ baseUrl, }) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+    function refreshToken(_a) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* ({ baseUrl, }) {
             // Only refresh if we have balena-auth
             if (auth == null) {
                 throw new Error('Auth module not provided in initializer');
@@ -365,4 +365,3 @@ function getRequest({ auth, debug = false, retries = 0, isBrowser = false, inter
     };
     return exports;
 }
-exports.getRequest = getRequest;

package/build/utils.js

@@ -15,7 +15,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRequestAsync = exports.getBody = exports.debugRequest = exports.getResponseLength = exports.isResponseCompressed = exports.isErrorCode = exports.getErrorMessageFromResponse = exports.getAuthorizationHeader = exports.shouldRefreshKey = exports.TOKEN_REFRESH_INTERVAL = void 0;
+exports.TOKEN_REFRESH_INTERVAL = void 0;
+exports.shouldRefreshKey = shouldRefreshKey;
+exports.getAuthorizationHeader = getAuthorizationHeader;
+exports.getErrorMessageFromResponse = getErrorMessageFromResponse;
+exports.isErrorCode = isErrorCode;
+exports.isResponseCompressed = isResponseCompressed;
+exports.getResponseLength = getResponseLength;
+exports.debugRequest = debugRequest;
+exports.getBody = getBody;
+exports.getRequestAsync = getRequestAsync;
 const tslib_1 = require("tslib");
 const { fetch: normalFetch, Headers: HeadersPonyfill } = 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -48,8 +57,8 @@ exports.TOKEN_REFRESH_INTERVAL = 24 * 60 * 60 * 1000; // 1 day in milliseconds
  * 			console.log('Updating token!')
  */
 function shouldRefreshKey(auth) {
-    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a;
         const hasKey = yield auth.hasKey();
         if (!hasKey) {
             return false;
@@ -62,7 +71,6 @@ function shouldRefreshKey(auth) {
         return age >= exports.TOKEN_REFRESH_INTERVAL;
     });
 }
-exports.shouldRefreshKey = shouldRefreshKey;
 /**
  * @summary Get authorization header content
  * @function
@@ -92,7 +100,6 @@ function getAuthorizationHeader(auth) {
         return `Bearer ${key}`;
     });
 }
-exports.getAuthorizationHeader = getAuthorizationHeader;
 /**
  * @summary Get error message from response
  * @function
@@ -126,7 +133,6 @@ function getErrorMessageFromResponse(response) {
     }
     return response.body;
 }
-exports.getErrorMessageFromResponse = getErrorMessageFromResponse;
 /**
  * @summary Check if the status code represents an error
  * @function
@@ -142,7 +148,6 @@ exports.getErrorMessageFromResponse = getErrorMessageFromResponse;
 function isErrorCode(statusCode) {
     return statusCode >= 400;
 }
-exports.isErrorCode = isErrorCode;
 /**
  * @summary Check whether a response body is compressed
  * @function
@@ -158,7 +163,6 @@ exports.isErrorCode = isErrorCode;
 function isResponseCompressed(response) {
     return response.headers.get('Content-Encoding') === 'gzip';
 }
-exports.isResponseCompressed = isResponseCompressed;
 /**
  * @summary Get response compressed/uncompressed length
  * @function
@@ -180,7 +184,6 @@ function getResponseLength(response) {
         compressed: parseInt(response.headers.get('X-Transfer-Length'), 10) || undefined,
     };
 }
-exports.getResponseLength = getResponseLength;
 /**
  * @summary Print debug information about a request/response.
  * @function
@@ -201,7 +204,6 @@ exports.getResponseLength = getResponseLength;
 function debugRequest(options, response) {
     return console.error(Object.assign({ statusCode: response.statusCode, duration: response.duration }, options));
 }
-exports.debugRequest = debugRequest;
 // fetch adapter
 const UNSUPPORTED_REQUEST_PARAMS = [
     'qsParseOptions',
@@ -270,7 +272,17 @@ const processRequestOptions = function (options) {
             throw new Error(`The ${key} param is not supported. Value: ${unsupportedOptionValue}`);
         }
     }
-    const opts = Object.assign({ timeout: options.timeout, retries: options.retries, method: options.method, compress: options.gzip, signal: options.signal, body, headers: new HeadersPonyfill(headers), mode: 'cors' }, (options.followRedirect && { redirect: 'follow' }));
+    const opts = {
+        timeout: options.timeout,
+        retries: options.retries,
+        method: options.method,
+        compress: options.gzip,
+        signal: options.signal,
+        body,
+        headers: new HeadersPonyfill(headers),
+        mode: 'cors',
+        redirect: options.followRedirect === false ? 'manual' : 'follow',
+    };
     return [url, opts];
 };
 /**
@@ -316,7 +328,6 @@ function getBody(response, responseFormat) {
         throw new errors.BalenaInvalidParameterError('responseFormat', responseFormat);
     });
 }
-exports.getBody = getBody;
 const isFile = (value) => {
     return (value instanceof Blob &&
         value.name != null &&
@@ -333,8 +344,8 @@ const getForm = () => {
 };
 // This is the actual implementation that hides the internal `retriesRemaining` parameter
 function requestAsync(fetch, options, retriesRemaining) {
-    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a;
         const [url, opts] = processRequestOptions(options);
         if (retriesRemaining == null) {
             retriesRemaining = opts.retries;
@@ -466,4 +477,3 @@ function handleAbortIfNotSupported(signal, response) {
 function getRequestAsync($fetch = normalFetch) {
     return (options) => requestAsync($fetch, options);
 }
-exports.getRequestAsync = getRequestAsync;

package/lib/utils.ts

@@ -313,7 +313,7 @@ const processRequestOptions = function (options: BalenaRequestOptions) {
 		body,
 		headers: new HeadersPonyfill(headers),
 		mode: 'cors',
-		...(options.followRedirect && { redirect: 'follow' }),
+		redirect: options.followRedirect === false ? 'manual' : 'follow',
 	};
 
 	return [url, opts] as const;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balena-request",
-  "version": "13.3.1",
+  "version": "13.3.2",
   "description": "Balena HTTP client",
   "main": "build/request.js",
   "types": "build/request.d.ts",
@@ -82,6 +82,6 @@
     "balena-auth": "^6.0.1"
   },
   "versionist": {
-    "publishedAt": "2024-02-23T10:45:59.590Z"
+    "publishedAt": "2024-07-12T08:40:04.114Z"
   }
 }