n8n-nodes-better-http-request 0.1.0 → 0.3.0

package/dist/nodes/BetterHttpRequest/BetterHttpRequest.node.js

@@ -8,38 +8,10 @@ const set_1 = __importDefault(require("lodash/set"));
 const n8n_workflow_1 = require("n8n-workflow");
 const Description_1 = require("./Description");
 const helpers_1 = require("./helpers");
-function toText(data) {
-    if (typeof data === 'object' && data !== null) {
-        return JSON.stringify(data);
-    }
-    return data;
-}
-function parseJsonParameter(node, jsonString, fieldName, itemIndex) {
-    try {
-        return JSON.parse(jsonString);
-    }
-    catch (e) {
-        const error = (0, n8n_workflow_1.ensureError)(e);
-        throw new n8n_workflow_1.NodeOperationError(node, `The value in the "${fieldName}" field is not valid JSON`, {
-            itemIndex,
-            description: error.message,
-        });
-    }
-}
-function isDomainAllowedLocal(url, opts) {
-    try {
-        const parsedUrl = new URL(url);
-        const hostname = parsedUrl.hostname.toLowerCase();
-        const allowedDomains = opts.allowedDomains
-            .split(',')
-            .map((d) => d.trim().toLowerCase())
-            .filter((d) => d.length > 0);
-        return allowedDomains.some((domain) => hostname === domain || hostname.endsWith('.' + domain));
-    }
-    catch {
-        return false;
-    }
-}
+const RequestUtils_1 = require("./RequestUtils");
+const DomainValidator_1 = require("./DomainValidator");
+const CredentialHandler_1 = require("./CredentialHandler");
+const constants_1 = require("./constants");
 class BetterHttpRequest {
     constructor() {
         this.description = {
@@ -71,10 +43,11 @@ class BetterHttpRequest {
         };
     }
     async execute() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
         const items = this.getInputData();
         const nodeVersion = this.getNode().typeVersion;
-        const fullResponseProperties = ['body', 'headers', 'statusCode', 'statusMessage'];
+        this.logger.debug('Starting Better HTTP Request node execution', { numberOfItems: items.length });
+        const fullResponseProperties = constants_1.FULL_RESPONSE_PROPERTIES;
         let authentication;
         try {
             authentication = this.getNodeParameter('authentication', 0);
@@ -96,14 +69,14 @@ class BetterHttpRequest {
         };
         let returnItems = [];
         const errorItems = {};
-        const requestPromises = [];
+        const requestExecutors = new Array(items.length);
         let fullResponse = false;
         let autoDetectResponseFormat = false;
         let responseFileName;
         const pagination = this.getNodeParameter('options.pagination.pagination', 0, null, {
             rawExpressions: true,
         });
-        const requests = [];
+        const requests = new Array(items.length);
         const updadeQueryParameter = (0, helpers_1.updadeQueryParameterConfig)(nodeVersion);
         for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
             try {
@@ -138,58 +111,7 @@ class BetterHttpRequest {
                     nodeCredentialType = this.getNodeParameter('nodeCredentialType', itemIndex);
                 }
                 const url = this.getNodeParameter('url', itemIndex);
-                if (typeof url !== 'string') {
-                    const actualType = url === null ? 'null' : typeof url;
-                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), `URL parameter must be a string, got ${actualType}`);
-                }
-                if (!url.startsWith('http://') && !url.startsWith('https://')) {
-                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Invalid URL: ${url}. URL must start with "http" or "https".`);
-                }
-                const checkDomainRestrictions = async (credentialData, requestUrl, credentialType) => {
-                    if (credentialData.allowedHttpRequestDomains === 'domains') {
-                        const allowedDomains = credentialData.allowedDomains;
-                        if (!allowedDomains || allowedDomains.trim() === '') {
-                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'No allowed domains specified. Configure allowed domains or change restriction setting.');
-                        }
-                        if (!isDomainAllowedLocal(requestUrl, { allowedDomains })) {
-                            const credentialInfo = credentialType ? ` (${credentialType})` : '';
-                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Domain not allowed: This credential${credentialInfo} is restricted from accessing ${requestUrl}. ` +
-                                `Only the following domains are allowed: ${allowedDomains}`);
-                        }
-                    }
-                    else if (credentialData.allowedHttpRequestDomains === 'none') {
-                        throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'This credential is configured to prevent use within an HTTP Request node');
-                    }
-                };
-                if (httpBasicAuth)
-                    await checkDomainRestrictions(httpBasicAuth, url);
-                if (httpBearerAuth)
-                    await checkDomainRestrictions(httpBearerAuth, url);
-                if (httpDigestAuth)
-                    await checkDomainRestrictions(httpDigestAuth, url);
-                if (httpHeaderAuth)
-                    await checkDomainRestrictions(httpHeaderAuth, url);
-                if (httpQueryAuth)
-                    await checkDomainRestrictions(httpQueryAuth, url);
-                if (httpCustomAuth)
-                    await checkDomainRestrictions(httpCustomAuth, url);
-                if (oAuth1Api)
-                    await checkDomainRestrictions(oAuth1Api, url);
-                if (oAuth2Api)
-                    await checkDomainRestrictions(oAuth2Api, url);
-                if (nodeCredentialType) {
-                    try {
-                        const credentialData = await this.getCredentials(nodeCredentialType, itemIndex);
-                        await checkDomainRestrictions(credentialData, url, nodeCredentialType);
-                    }
-                    catch (error) {
-                        if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('Domain not allowed')) ||
-                            ((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('configured to prevent')) ||
-                            ((_c = error.message) === null || _c === void 0 ? void 0 : _c.includes('No allowed domains specified'))) {
-                            throw error;
-                        }
-                    }
-                }
+                (0, DomainValidator_1.validateUrl)(this.getNode(), url, itemIndex);
                 const provideSslCertificates = this.getNodeParameter('provideSslCertificates', itemIndex, false);
                 if (provideSslCertificates) {
                     sslCertificates = (await this.getCredentials('httpSslAuth', itemIndex));
@@ -210,12 +132,12 @@ class BetterHttpRequest {
                 const specifyHeaders = this.getNodeParameter('specifyHeaders', itemIndex, 'keypair');
                 const jsonHeadersParameter = this.getNodeParameter('jsonHeaders', itemIndex, '');
                 const { redirect, batching, proxy, timeout, allowUnauthorizedCerts, queryParameterArrays, response, lowercaseHeaders, sendCredentialsOnCrossOriginRedirect, } = this.getNodeParameter('options', itemIndex, {});
-                responseFileName = (_d = response === null || response === void 0 ? void 0 : response.response) === null || _d === void 0 ? void 0 : _d.outputPropertyName;
-                const responseFormat = ((_e = response === null || response === void 0 ? void 0 : response.response) === null || _e === void 0 ? void 0 : _e.responseFormat) || 'autodetect';
-                fullResponse = ((_f = response === null || response === void 0 ? void 0 : response.response) === null || _f === void 0 ? void 0 : _f.fullResponse) || false;
+                responseFileName = (_a = response === null || response === void 0 ? void 0 : response.response) === null || _a === void 0 ? void 0 : _a.outputPropertyName;
+                const responseFormat = ((_b = response === null || response === void 0 ? void 0 : response.response) === null || _b === void 0 ? void 0 : _b.responseFormat) || 'autodetect';
+                fullResponse = ((_c = response === null || response === void 0 ? void 0 : response.response) === null || _c === void 0 ? void 0 : _c.fullResponse) || false;
                 autoDetectResponseFormat = responseFormat === 'autodetect';
-                const batchSize = ((_g = batching === null || batching === void 0 ? void 0 : batching.batch) === null || _g === void 0 ? void 0 : _g.batchSize) > 0 ? (_h = batching === null || batching === void 0 ? void 0 : batching.batch) === null || _h === void 0 ? void 0 : _h.batchSize : 1;
-                const batchInterval = (_j = batching === null || batching === void 0 ? void 0 : batching.batch) === null || _j === void 0 ? void 0 : _j.batchInterval;
+                const batchSize = ((_d = batching === null || batching === void 0 ? void 0 : batching.batch) === null || _d === void 0 ? void 0 : _d.batchSize) > 0 ? (_e = batching === null || batching === void 0 ? void 0 : batching.batch) === null || _e === void 0 ? void 0 : _e.batchSize : 1;
+                const batchInterval = (_f = batching === null || batching === void 0 ? void 0 : batching.batch) === null || _f === void 0 ? void 0 : _f.batchInterval;
                 if (itemIndex > 0 && batchSize >= 0 && batchInterval > 0) {
                     if (itemIndex % batchSize === 0) {
                         await (0, n8n_workflow_1.sleep)(batchInterval);
@@ -235,25 +157,20 @@ class BetterHttpRequest {
                     requestOptions = { ...requestOptions, followAllRedirects: false };
                 }
                 const defaultRedirect = redirect === undefined;
-                if (((_k = redirect === null || redirect === void 0 ? void 0 : redirect.redirect) === null || _k === void 0 ? void 0 : _k.followRedirects) || defaultRedirect) {
+                if (((_g = redirect === null || redirect === void 0 ? void 0 : redirect.redirect) === null || _g === void 0 ? void 0 : _g.followRedirects) || defaultRedirect) {
                     requestOptions.followRedirect = true;
                     requestOptions.followAllRedirects = true;
                 }
-                if (((_l = redirect === null || redirect === void 0 ? void 0 : redirect.redirect) === null || _l === void 0 ? void 0 : _l.maxRedirects) || defaultRedirect) {
-                    requestOptions.maxRedirects = (_m = redirect === null || redirect === void 0 ? void 0 : redirect.redirect) === null || _m === void 0 ? void 0 : _m.maxRedirects;
+                if (((_h = redirect === null || redirect === void 0 ? void 0 : redirect.redirect) === null || _h === void 0 ? void 0 : _h.maxRedirects) || defaultRedirect) {
+                    requestOptions.maxRedirects = (_j = redirect === null || redirect === void 0 ? void 0 : redirect.redirect) === null || _j === void 0 ? void 0 : _j.maxRedirects;
                 }
-                if ((_o = response === null || response === void 0 ? void 0 : response.response) === null || _o === void 0 ? void 0 : _o.neverError) {
+                if ((_k = response === null || response === void 0 ? void 0 : response.response) === null || _k === void 0 ? void 0 : _k.neverError) {
                     requestOptions.simple = false;
                 }
                 if (proxy) {
                     requestOptions.proxy = proxy;
                 }
-                if (timeout) {
-                    requestOptions.timeout = timeout;
-                }
-                else {
-                    requestOptions.timeout = 300000;
-                }
+                requestOptions.timeout = timeout || constants_1.DEFAULT_TIMEOUT_MS;
                 if (sendQuery && queryParameterArrays) {
                     Object.assign(requestOptions, {
                         qsStringifyOptions: { arrayFormat: queryParameterArrays },
@@ -290,7 +207,7 @@ class BetterHttpRequest {
                     else if (specifyBody === 'json') {
                         if (typeof jsonBodyParameter !== 'object' &&
                             jsonBodyParameter !== null) {
-                            requestOptions.body = parseJsonParameter(this.getNode(), jsonBodyParameter, 'JSON Body', itemIndex);
+                            requestOptions.body = (0, RequestUtils_1.parseJsonParameter)(this.getNode(), jsonBodyParameter, 'JSON Body', itemIndex);
                         }
                         else {
                             requestOptions.body = jsonBodyParameter;
@@ -327,7 +244,7 @@ class BetterHttpRequest {
                         requestOptions.headers = {
                             ...requestOptions.headers,
                             'content-length': contentLength,
-                            'content-type': (_p = itemBinaryData.mimeType) !== null && _p !== void 0 ? _p : 'application/octet-stream',
+                            'content-type': (_l = itemBinaryData.mimeType) !== null && _l !== void 0 ? _l : 'application/octet-stream',
                         };
                     }
                     else if (bodyContentType === 'raw') {
@@ -339,7 +256,7 @@ class BetterHttpRequest {
                         requestOptions.qs = await (0, helpers_1.reduceAsync)(queryParameters, parametersToKeyValue);
                     }
                     else if (specifyQuery === 'json') {
-                        requestOptions.qs = parseJsonParameter(this.getNode(), jsonQueryParameter, 'JSON Query Parameters', itemIndex);
+                        requestOptions.qs = (0, RequestUtils_1.parseJsonParameter)(this.getNode(), jsonQueryParameter, 'JSON Query Parameters', itemIndex);
                     }
                 }
                 if (sendHeaders && headerParameters) {
@@ -348,7 +265,7 @@ class BetterHttpRequest {
                         additionalHeaders = await (0, helpers_1.reduceAsync)(headerParameters.filter((header) => header.name), parametersToKeyValue);
                     }
                     else if (specifyHeaders === 'json') {
-                        additionalHeaders = parseJsonParameter(this.getNode(), jsonHeadersParameter, 'JSON Headers', itemIndex);
+                        additionalHeaders = (0, RequestUtils_1.parseJsonParameter)(this.getNode(), jsonHeadersParameter, 'JSON Headers', itemIndex);
                     }
                     requestOptions.headers = {
                         ...requestOptions.headers,
@@ -381,77 +298,28 @@ class BetterHttpRequest {
                 if (requestOptions.agentOptions) {
                     authDataKeys.agentOptions = Object.keys(requestOptions.agentOptions);
                 }
-                if (httpBasicAuth !== undefined) {
-                    requestOptions.auth = {
-                        user: httpBasicAuth.user,
-                        pass: httpBasicAuth.password,
-                    };
-                    authDataKeys.auth = ['pass'];
-                }
-                if (httpBearerAuth !== undefined) {
-                    requestOptions.headers = (_q = requestOptions.headers) !== null && _q !== void 0 ? _q : {};
-                    requestOptions.headers.Authorization = `Bearer ${String(httpBearerAuth.token)}`;
-                    authDataKeys.headers = ['Authorization'];
-                }
-                if (httpHeaderAuth !== undefined) {
-                    requestOptions.headers[httpHeaderAuth.name] =
-                        httpHeaderAuth.value;
-                    authDataKeys.headers = [httpHeaderAuth.name];
-                }
-                if (httpQueryAuth !== undefined) {
-                    if (!requestOptions.qs) {
-                        requestOptions.qs = {};
-                    }
-                    requestOptions.qs[httpQueryAuth.name] = httpQueryAuth.value;
-                    authDataKeys.qs = [httpQueryAuth.name];
-                }
-                if (httpDigestAuth !== undefined) {
-                    requestOptions.auth = {
-                        user: httpDigestAuth.user,
-                        pass: httpDigestAuth.password,
-                        sendImmediately: false,
-                    };
-                    authDataKeys.auth = ['pass'];
-                }
-                if (httpCustomAuth !== undefined) {
-                    const customAuth = (0, n8n_workflow_1.jsonParse)(httpCustomAuth.json || '{}', { errorMessage: 'Invalid Custom Auth JSON' });
-                    if (customAuth.headers) {
-                        requestOptions.headers = {
-                            ...requestOptions.headers,
-                            ...customAuth.headers,
-                        };
-                        authDataKeys.headers = Object.keys(customAuth.headers);
-                    }
-                    if (customAuth.body) {
-                        requestOptions.body = {
-                            ...requestOptions.body,
-                            ...customAuth.body,
-                        };
-                        authDataKeys.body = Object.keys(customAuth.body);
-                    }
-                    if (customAuth.qs) {
-                        requestOptions.qs = { ...requestOptions.qs, ...customAuth.qs };
-                        authDataKeys.qs = Object.keys(customAuth.qs);
-                    }
-                }
+                (0, CredentialHandler_1.applyAllCredentials)(requestOptions, {
+                    httpBasicAuth,
+                    httpBearerAuth,
+                    httpHeaderAuth,
+                    httpQueryAuth,
+                    httpDigestAuth,
+                    httpCustomAuth,
+                }, authDataKeys);
                 if (requestOptions.headers.accept === undefined) {
-                    if (responseFormat === 'json') {
-                        requestOptions.headers.accept = 'application/json,text/*;q=0.99';
-                    }
-                    else if (responseFormat === 'text') {
-                        requestOptions.headers.accept =
-                            'application/json,text/html,application/xhtml+xml,application/xml,text/*;q=0.9, */*;q=0.1';
-                    }
-                    else {
-                        requestOptions.headers.accept =
-                            'application/json,text/html,application/xhtml+xml,application/xml,text/*;q=0.9, image/*;q=0.8, */*;q=0.7';
-                    }
-                }
-                requests.push({
-                    options: requestOptions,
+                    requestOptions.headers.accept =
+                        responseFormat === 'json'
+                            ? constants_1.ACCEPT_HEADERS.JSON
+                            : responseFormat === 'text'
+                                ? constants_1.ACCEPT_HEADERS.TEXT
+                                : constants_1.ACCEPT_HEADERS.AUTO;
+                }
+                const itemRequestOptions = requestOptions;
+                requests[itemIndex] = {
+                    options: itemRequestOptions,
                     authKeys: authDataKeys,
                     credentialType: nodeCredentialType,
-                });
+                };
                 if (pagination && pagination.paginationMode !== 'off') {
                     let continueExpression = '={{false}}';
                     if (pagination.paginationCompleteWhen === 'receiveSpecificStatusCodes') {
@@ -472,7 +340,7 @@ class BetterHttpRequest {
                         const completionExpression = pagination.completeExpression
                             .trim()
                             .slice(3, -2);
-                        if ((_r = response === null || response === void 0 ? void 0 : response.response) === null || _r === void 0 ? void 0 : _r.neverError) {
+                        if ((_m = response === null || response === void 0 ? void 0 : response.response) === null || _m === void 0 ? void 0 : _m.neverError) {
                             continueExpression = `={{ !(${completionExpression}) }}`;
                         }
                         else {
@@ -517,83 +385,134 @@ class BetterHttpRequest {
                     if (responseFormat === 'file') {
                         paginationData.binaryResult = true;
                     }
-                    const requestPromise = this.helpers.requestWithAuthenticationPaginated
-                        .call(this, requestOptions, itemIndex, paginationData, nodeCredentialType !== null && nodeCredentialType !== void 0 ? nodeCredentialType : genericCredentialType)
-                        .catch((error) => {
-                        if (error instanceof n8n_workflow_1.NodeOperationError &&
-                            error.type === 'invalid_url') {
-                            const urlParameterName = pagination.paginationMode ===
-                                'responseContainsNextURL'
-                                ? 'Next URL'
-                                : 'URL';
-                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), error.message, {
-                                description: `Make sure the "${urlParameterName}" parameter evaluates to a valid URL.`,
-                            });
-                        }
-                        throw error;
-                    });
-                    requestPromises.push(requestPromise);
+                    requestExecutors[itemIndex] = async () => {
+                        return await this.helpers.requestWithAuthenticationPaginated
+                            .call(this, itemRequestOptions, itemIndex, paginationData, nodeCredentialType !== null && nodeCredentialType !== void 0 ? nodeCredentialType : genericCredentialType)
+                            .catch((error) => {
+                            if (error instanceof n8n_workflow_1.NodeOperationError &&
+                                error.type === 'invalid_url') {
+                                const urlParameterName = pagination.paginationMode ===
+                                    'responseContainsNextURL'
+                                    ? 'Next URL'
+                                    : 'URL';
+                                throw new n8n_workflow_1.NodeOperationError(this.getNode(), error.message, {
+                                    description: `Make sure the "${urlParameterName}" parameter evaluates to a valid URL.`,
+                                });
+                            }
+                            throw error;
+                        });
+                    };
                 }
                 else if (authentication === 'genericCredentialType' ||
                     authentication === 'none') {
                     if (oAuth1Api) {
-                        const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions);
-                        requestOAuth1.catch(() => { });
-                        requestPromises.push(requestOAuth1);
+                        requestExecutors[itemIndex] = async () => await this.helpers.requestOAuth1.call(this, 'oAuth1Api', itemRequestOptions);
                     }
                     else if (oAuth2Api) {
-                        const requestOAuth2 = this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, { tokenType: 'Bearer' });
-                        requestOAuth2.catch(() => { });
-                        requestPromises.push(requestOAuth2);
+                        requestExecutors[itemIndex] = async () => await this.helpers.requestOAuth2.call(this, 'oAuth2Api', itemRequestOptions, { tokenType: 'Bearer' });
                     }
                     else {
-                        const request = this.helpers.request(requestOptions);
-                        request.catch(() => { });
-                        requestPromises.push(request);
+                        requestExecutors[itemIndex] = async () => await this.helpers.request(itemRequestOptions);
                     }
                 }
                 else if (authentication === 'predefinedCredentialType' &&
                     nodeCredentialType) {
-                    const additionalOAuth2Options = (0, helpers_1.getOAuth2AdditionalParameters)(nodeCredentialType);
-                    const requestWithAuthentication = this.helpers.requestWithAuthentication.call(this, nodeCredentialType, requestOptions, additionalOAuth2Options && {
+                    const credentialType = nodeCredentialType;
+                    const additionalOAuth2Options = (0, helpers_1.getOAuth2AdditionalParameters)(credentialType);
+                    requestExecutors[itemIndex] = async () => await this.helpers.requestWithAuthentication.call(this, credentialType, itemRequestOptions, additionalOAuth2Options && {
                         oauth2: additionalOAuth2Options,
                     }, itemIndex);
-                    requestWithAuthentication.catch(() => { });
-                    requestPromises.push(requestWithAuthentication);
                 }
             }
             catch (error) {
                 if (!this.continueOnFail())
                     throw error;
-                requestPromises.push(Promise.reject(error).catch(() => { }));
                 errorItems[itemIndex] = error.message;
+                this.logger.warn(`Failed to process item ${itemIndex}`, { error: error.message });
                 continue;
             }
         }
-        const sanitizedRequests = [];
-        const promisesResponses = await Promise.allSettled(requestPromises.map(async (requestPromise, itemIndex) => await requestPromise
-            .then((response) => response)
-            .finally(async () => {
-            if (errorItems[itemIndex])
-                return;
+        const sanitizedRequests = new Array(items.length);
+        const promisesResponses = new Array(items.length);
+        const inFlightTasks = new Set();
+        let completedCount = 0;
+        const totalCount = items.length;
+        const reportProgress = () => {
+            const percentage = Math.round((completedCount / totalCount) * 100);
+            this.sendMessageToUI({
+                type: 'progress',
+                message: `${percentage}% complete (${completedCount}/${totalCount} items)`,
+                percentage,
+                completed: completedCount,
+                total: totalCount,
+            });
+        };
+        const executeRequestWithTracking = async (itemIndex, executor) => {
+            this.logger.debug(`Executing request for item ${itemIndex}`);
             try {
-                const { options, authKeys, credentialType } = requests[itemIndex];
-                let secrets = [];
-                if (credentialType) {
-                    const properties = this.getCredentialsProperties(credentialType);
-                    const credentials = await this.getCredentials(credentialType, itemIndex);
-                    secrets = (0, helpers_1.getSecrets)(properties, credentials);
+                const value = await executor();
+                promisesResponses[itemIndex] = {
+                    status: 'fulfilled',
+                    value,
+                };
+            }
+            catch (reason) {
+                promisesResponses[itemIndex] = {
+                    status: 'rejected',
+                    reason,
+                };
+                this.logger.debug(`Request failed for item ${itemIndex}`, { error: reason });
+            }
+            finally {
+                if (!errorItems[itemIndex]) {
+                    try {
+                        const requestData = requests[itemIndex];
+                        if (requestData) {
+                            const { options, authKeys, credentialType } = requestData;
+                            let secrets = [];
+                            if (credentialType) {
+                                const properties = this.getCredentialsProperties(credentialType);
+                                const credentials = await this.getCredentials(credentialType, itemIndex);
+                                secrets = (0, helpers_1.getSecrets)(properties, credentials);
+                            }
+                            const sanitizedRequestOptions = (0, helpers_1.sanitizeUiMessage)(options, authKeys, secrets);
+                            sanitizedRequests[itemIndex] = sanitizedRequestOptions;
+                            this.sendMessageToUI(sanitizedRequestOptions);
+                        }
+                    }
+                    catch { }
                 }
-                const sanitizedRequestOptions = (0, helpers_1.sanitizeUiMessage)(options, authKeys, secrets);
-                sanitizedRequests.push(sanitizedRequestOptions);
-                this.sendMessageToUI(sanitizedRequestOptions);
+                completedCount++;
+                reportProgress();
+            }
+        };
+        for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+            const executor = requestExecutors[itemIndex];
+            if (errorItems[itemIndex] || !executor) {
+                promisesResponses[itemIndex] = {
+                    status: 'fulfilled',
+                    value: undefined,
+                };
+                completedCount++;
+                reportProgress();
+                continue;
             }
-            catch { }
-        })));
+            while (inFlightTasks.size >= constants_1.MAX_CONCURRENT_REQUESTS) {
+                await Promise.race(inFlightTasks);
+            }
+            let task;
+            task = executeRequestWithTracking(itemIndex, executor).finally(() => {
+                inFlightTasks.delete(task);
+            });
+            inFlightTasks.add(task);
+        }
+        if (inFlightTasks.size > 0) {
+            await Promise.all(inFlightTasks);
+        }
         let responseData;
         for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
             try {
-                responseData = promisesResponses.shift();
+                responseData = promisesResponses[itemIndex];
                 if (errorItems[itemIndex]) {
                     returnItems.push({
                         json: { error: errorItems[itemIndex] },
@@ -603,8 +522,7 @@ class BetterHttpRequest {
                 }
                 if (responseData.status !== 'fulfilled') {
                     if (responseData.reason.statusCode === 429) {
-                        responseData.reason.message =
-                            "Try spacing your requests out using the batching settings under 'Options'";
+                        responseData.reason.message = constants_1.UI_MESSAGES.RATE_LIMITED_HINT;
                     }
                     if (!this.continueOnFail()) {
                         if (autoDetectResponseFormat &&
@@ -639,7 +557,7 @@ class BetterHttpRequest {
                                 ...(reason.code !== undefined ? { code: reason.code } : {}),
                                 ...(reason.description !== undefined ? { description: reason.description } : {}),
                                 ...(reason.headers ? { headers: reason.headers } : {}),
-                                ...(((_s = reason.response) === null || _s === void 0 ? void 0 : _s.headers) ? { response: { headers: reason.response.headers } } : {}),
+                                ...(((_o = reason.response) === null || _o === void 0 ? void 0 : _o.headers) ? { response: { headers: reason.response.headers } } : {}),
                             };
                         }
                         else if (typeof reason === 'object' && reason !== null) {
@@ -661,17 +579,13 @@ class BetterHttpRequest {
                         continue;
                     }
                 }
-                let responses;
-                if (Array.isArray(responseData.value)) {
-                    responses = responseData.value;
-                }
-                else {
-                    responses = [responseData.value];
-                }
+                const responses = Array.isArray(responseData.value)
+                    ? responseData.value
+                    : [responseData.value];
                 let responseFormat = this.getNodeParameter('options.response.response.responseFormat', 0, 'autodetect');
                 fullResponse = this.getNodeParameter('options.response.response.fullResponse', 0, false);
                 for (let [index, response] of Object.entries(responses)) {
-                    if (((_t = response === null || response === void 0 ? void 0 : response.request) === null || _t === void 0 ? void 0 : _t.constructor.name) === 'ClientRequest')
+                    if (((_p = response === null || response === void 0 ? void 0 : response.request) === null || _p === void 0 ? void 0 : _p.constructor.name) === 'ClientRequest')
                         delete response.request;
                     if (this.getMode() === 'manual' && index === '0') {
                         const nodeContext = this.getContext('node');
@@ -682,7 +596,7 @@ class BetterHttpRequest {
                             nodeContext.response = responseData.value;
                         }
                     }
-                    const responseContentType = (_v = (_u = response.headers) === null || _u === void 0 ? void 0 : _u['content-type']) !== null && _v !== void 0 ? _v : '';
+                    const responseContentType = (_r = (_q = response.headers) === null || _q === void 0 ? void 0 : _q['content-type']) !== null && _r !== void 0 ? _r : '';
                     if (autoDetectResponseFormat) {
                         if (responseContentType.includes('application/json')) {
                             responseFormat = 'json';
@@ -758,7 +672,7 @@ class BetterHttpRequest {
                             const returnItem = {};
                             for (const property of fullResponseProperties) {
                                 if (property === 'body') {
-                                    returnItem[outputPropertyName] = toText(response[property]);
+                                    returnItem[outputPropertyName] = (0, RequestUtils_1.toText)(response[property]);
                                     continue;
                                 }
                                 returnItem[property] = response[property];
@@ -771,7 +685,7 @@ class BetterHttpRequest {
                         else {
                             returnItems.push({
                                 json: {
-                                    [outputPropertyName]: toText(response),
+                                    [outputPropertyName]: (0, RequestUtils_1.toText)(response),
                                 },
                                 pairedItem: { item: itemIndex },
                             });
@@ -829,7 +743,13 @@ class BetterHttpRequest {
                 if (!this.continueOnFail())
                     throw error;
                 returnItems.push({
-                    json: { error: error.message },
+                    json: {
+                        error: {
+                            message: error.message,
+                            code: error.code,
+                            statusCode: error.statusCode,
+                        },
+                    },
                     pairedItem: { item: itemIndex },
                 });
                 continue;
@@ -837,13 +757,19 @@ class BetterHttpRequest {
         }
         const retryOnFail = this.getNodeParameter('options.retryOnFail', 0, false);
         if (retryOnFail && this.continueOnFail()) {
-            const maxRetries = this.getNodeParameter('options.maxRetries', 0, 3);
-            const retryDelay = this.getNodeParameter('options.retryDelay', 0, 1000);
-            const retryOnStatusCodesStr = this.getNodeParameter('options.retryOnStatusCodes', 0, '429,500,502,503,504');
+            const getOriginalItemIndex = (item, fallback) => item.pairedItem &&
+                typeof item.pairedItem === 'object' &&
+                !Array.isArray(item.pairedItem)
+                ? item.pairedItem.item
+                : fallback;
+            const maxRetries = this.getNodeParameter('options.maxRetries', 0, constants_1.DEFAULT_MAX_RETRIES);
+            const retryDelay = this.getNodeParameter('options.retryDelay', 0, constants_1.DEFAULT_RETRY_DELAY);
+            const retryOnStatusCodesStr = this.getNodeParameter('options.retryOnStatusCodes', 0, constants_1.DEFAULT_RETRY_ON_STATUS_CODES);
             const retryOnStatusCodes = new Set(retryOnStatusCodesStr
                 .split(',')
                 .map((s) => parseInt(s.trim(), 10))
                 .filter((n) => !isNaN(n)));
+            const retryOnErrorCodes = new Set(constants_1.RETRYABLE_CONNECTION_ERRORS);
             for (let attempt = 0; attempt < maxRetries; attempt++) {
                 const failedIndices = [];
                 for (let i = 0; i < returnItems.length; i++) {
@@ -851,25 +777,30 @@ class BetterHttpRequest {
                     if (item.json && item.json.error) {
                         const errObj = item.json.error;
                         let statusCode;
+                        let errorCode;
                         if (typeof errObj === 'object' && errObj !== null) {
                             statusCode =
-                                (_x = (_w = errObj.statusCode) !== null && _w !== void 0 ? _w : errObj.httpCode) !== null && _x !== void 0 ? _x : errObj.code;
+                                (_s = errObj.statusCode) !== null && _s !== void 0 ? _s : errObj.httpCode;
+                            errorCode = errObj.code;
                         }
-                        if (statusCode !== undefined &&
-                            retryOnStatusCodes.has(statusCode)) {
+                        if ((statusCode !== undefined &&
+                            retryOnStatusCodes.has(statusCode)) ||
+                            (errorCode !== undefined &&
+                                retryOnErrorCodes.has(errorCode))) {
                             failedIndices.push(i);
                         }
                     }
                 }
                 if (failedIndices.length === 0)
                     break;
+                this.logger.info(`Retrying ${failedIndices.length} failed items, attempt ${attempt + 1} of ${maxRetries}`);
                 let effectiveDelay = retryDelay;
                 for (const idx of failedIndices) {
                     const errObj = returnItems[idx].json.error;
                     if (typeof errObj === 'object' && errObj !== null) {
                         const sc = errObj.statusCode;
                         if (sc === 429) {
-                            const retryAfterHeader = (_z = (_y = errObj.headers) === null || _y === void 0 ? void 0 : _y['retry-after']) !== null && _z !== void 0 ? _z : (_1 = (_0 = errObj.response) === null || _0 === void 0 ? void 0 : _0.headers) === null || _1 === void 0 ? void 0 : _1['retry-after'];
+                            const retryAfterHeader = (_u = (_t = errObj.headers) === null || _t === void 0 ? void 0 : _t['retry-after']) !== null && _u !== void 0 ? _u : (_w = (_v = errObj.response) === null || _v === void 0 ? void 0 : _v.headers) === null || _w === void 0 ? void 0 : _w['retry-after'];
                             if (retryAfterHeader) {
                                 const retryAfterSeconds = parseInt(retryAfterHeader, 10);
                                 if (!isNaN(retryAfterSeconds)) {
@@ -884,12 +815,7 @@ class BetterHttpRequest {
                 }
                 const retryPromises = [];
                 for (const idx of failedIndices) {
-                    const originalItemIndex = returnItems[idx].pairedItem &&
-                        typeof returnItems[idx].pairedItem === 'object' &&
-                        !Array.isArray(returnItems[idx].pairedItem)
-                        ? returnItems[idx].pairedItem
-                            .item
-                        : idx;
+                    const originalItemIndex = getOriginalItemIndex(returnItems[idx], idx);
                     if (requests[originalItemIndex]) {
                         const { options } = requests[originalItemIndex];
                         const retryRequest = this.helpers
@@ -905,12 +831,7 @@ class BetterHttpRequest {
                 for (let ri = 0; ri < retryResults.length; ri++) {
                     const result = retryResults[ri];
                     const idx = retryPromises[ri].index;
-                    const originalItemIndex = returnItems[idx].pairedItem &&
-                        typeof returnItems[idx].pairedItem === 'object' &&
-                        !Array.isArray(returnItems[idx].pairedItem)
-                        ? returnItems[idx].pairedItem
-                            .item
-                        : idx;
+                    const originalItemIndex = getOriginalItemIndex(returnItems[idx], idx);
                     if (result.status === 'fulfilled' && result.value != null) {
                         const response = result.value;
                         if (typeof response === 'object' &&
@@ -919,7 +840,7 @@ class BetterHttpRequest {
                             let responseFormat = this.getNodeParameter('options.response.response.responseFormat', 0, 'autodetect');
                             const currentFullResponse = this.getNodeParameter('options.response.response.fullResponse', 0, false);
                             if (responseFormat === 'autodetect') {
-                                const ct = (_3 = (_2 = response.headers) === null || _2 === void 0 ? void 0 : _2['content-type']) !== null && _3 !== void 0 ? _3 : '';
+                                const ct = (_y = (_x = response.headers) === null || _x === void 0 ? void 0 : _x['content-type']) !== null && _y !== void 0 ? _y : '';
                                 if (ct.includes('application/json')) {
                                     responseFormat = 'json';
                                 }
@@ -963,12 +884,22 @@ class BetterHttpRequest {
                                 }
                                 if (typeof bodyData === 'object' &&
                                     bodyData !== null) {
-                                    returnItems[idx] = {
-                                        json: bodyData,
-                                        pairedItem: {
-                                            item: originalItemIndex,
-                                        },
-                                    };
+                                    if (Object.keys(bodyData).length === 0) {
+                                        returnItems[idx] = {
+                                            json: { item: originalItemIndex },
+                                            pairedItem: {
+                                                item: originalItemIndex,
+                                            },
+                                        };
+                                    }
+                                    else {
+                                        returnItems[idx] = {
+                                            json: bodyData,
+                                            pairedItem: {
+                                                item: originalItemIndex,
+                                            },
+                                        };
+                                    }
                                 }
                                 else {
                                     returnItems[idx] = {
@@ -982,10 +913,18 @@ class BetterHttpRequest {
                         }
                         else if (typeof response === 'object' &&
                             response !== null) {
-                            returnItems[idx] = {
-                                json: response,
-                                pairedItem: { item: originalItemIndex },
-                            };
+                            if (Object.keys(response).length === 0) {
+                                returnItems[idx] = {
+                                    json: { item: originalItemIndex },
+                                    pairedItem: { item: originalItemIndex },
+                                };
+                            }
+                            else {
+                                returnItems[idx] = {
+                                    json: response,
+                                    pairedItem: { item: originalItemIndex },
+                                };
+                            }
                         }
                         else {
                             try {
@@ -1011,10 +950,11 @@ class BetterHttpRequest {
             }
         }
         returnItems = returnItems.map(helpers_1.replaceNullValues);
+        this.logger.debug('Better HTTP Request node execution finished', { returnItemsLength: returnItems.length });
         if (returnItems.length === 1 &&
             returnItems[0].json.data &&
             Array.isArray(returnItems[0].json.data)) {
-            const message = "To split the contents of 'data' into separate items for easier processing, add a 'Split Out' node after this one";
+            const message = constants_1.UI_MESSAGES.SPLIT_OUT_HINT;
             if (this.addExecutionHints) {
                 this.addExecutionHints({
                     message,