mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-12 21:37:32 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "fix(core): Improve axios error handling in nodes (#5699)"

Browse source 
This reverts commit 33d9784319.
This commit is contained in:
Jan Oberhauser 2023-04-01 19:03:12 +02:00
parent 9ada331212
commit aed5674530
2 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/core/package.json
View file

@ -39,7 +39,6 @@
"@types/crypto-js": "^4.0.1", "@types/crypto-js": "^4.0.1",
"@types/express": "^4.17.6", "@types/express": "^4.17.6",
"@types/lodash.get": "^4.4.6", "@types/lodash.get": "^4.4.6",
"@types/lodash.pick": "^4.4.7",
"@types/mime-types": "^2.1.0", "@types/mime-types": "^2.1.0",
"@types/request-promise-native": "~1.0.15", "@types/request-promise-native": "~1.0.15",
"@types/uuid": "^8.3.2" "@types/uuid": "^8.3.2"
@ -55,7 +54,6 @@
"flatted": "^3.2.4", "flatted": "^3.2.4",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"lodash.get": "^4.4.2", "lodash.get": "^4.4.2",
"lodash.pick": "^4.4.0",
"mime-types": "^2.1.27", "mime-types": "^2.1.27",
"n8n-workflow": "workspace:*", "n8n-workflow": "workspace:*",
"oauth-1.0a": "^2.2.6", "oauth-1.0a": "^2.2.6",

70
packages/core/src/NodeExecuteFunctions.ts
View file

@ -75,7 +75,6 @@ import {
ExpressionError, ExpressionError,
} from 'n8n-workflow'; } from 'n8n-workflow';
import pick from 'lodash.pick';
import { Agent } from 'https'; import { Agent } from 'https';
import { stringify } from 'qs'; import { stringify } from 'qs';
import type { Token } from 'oauth-1.0a'; import type { Token } from 'oauth-1.0a';
@ -676,47 +675,50 @@ async function proxyRequestToAxios(
return body; return body;
} }
} catch (error) { } catch (error) {
const { config, response } = error; const { request, response, isAxiosError, toJSON, config, ...errorData } = error;
if (configObject.simple === false && response) {
if (configObject.resolveWithFullResponse) {
return {
body: response.data,
headers: response.headers,
statusCode: response.status,
statusMessage: response.statusText,
};
} else {
return response.data;
}
}
// Axios hydrates the original error with more data. We extract them. // Axios hydrates the original error with more data. We extract them.
// https://github.com/axios/axios/blob/master/lib/core/enhanceError.js // https://github.com/axios/axios/blob/master/lib/core/enhanceError.js
// Note: `code` is ignored as it's an expected part of the errorData. // Note: `code` is ignored as it's an expected part of the errorData.
if (error.isAxiosError) { if (response) {
if (response) { Logger.debug('Request proxied to Axios failed', { status: response.status });
Logger.debug('Request proxied to Axios failed', { status: response.status }); let responseData = response.data;
let responseData = response.data;
if (Buffer.isBuffer(responseData) || responseData instanceof Readable) { if (Buffer.isBuffer(responseData) || responseData instanceof Readable) {
responseData = await binaryToBuffer(responseData).then((buffer) => responseData = await binaryToBuffer(responseData).then((buffer) =>
buffer.toString('utf-8'), buffer.toString('utf-8'),
); );
}
if (configObject.simple === false) {
if (configObject.resolveWithFullResponse) {
return {
body: responseData,
headers: response.headers,
statusCode: response.status,
statusMessage: response.statusText,
};
} else {
return responseData;
}
}
const message = `${response.status as number} - ${JSON.stringify(responseData)}`;
throw Object.assign(new Error(message, { cause: error }), {
status: response.status,
options: pick(config ?? {}, ['url', 'method', 'data', 'headers']),
});
} else {
throw Object.assign(new Error(error.message, { cause: error }), {
options: pick(config ?? {}, ['url', 'method', 'data', 'headers']),
});
} }
error.message = `${response.status as number} - ${JSON.stringify(responseData)}`;
} }
error.cause = errorData;
error.error = error.response?.data || errorData;
error.statusCode = error.response?.status;
error.options = config || {};
// Remove not needed data and so also remove circular references
error.request = undefined;
error.config = undefined;
error.options.adapter = undefined;
error.options.httpsAgent = undefined;
error.options.paramsSerializer = undefined;
error.options.transformRequest = undefined;
error.options.transformResponse = undefined;
error.options.validateStatus = undefined;
throw error; throw error;
} }
} }