mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-24 20:24:05 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: Error processing and output pane improvements (no-changelog) (#9626)

Browse source 
Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
This commit is contained in:
Michael Kret 2024-06-27 13:22:07 +03:00 committed by GitHub
parent a43d6f0c5e
commit 4773aad170
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 47 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/editor-ui/src/components/Error/NodeErrorView.vue
View file

@ -613,6 +613,7 @@ function copySuccess() {
}
&__header-description {
overflow: hidden;
padding: 0 var(--spacing-s) var(--spacing-3xs) var(--spacing-s);
font-size: var(--font-size-xs);

1
packages/nodes-base/nodes/Cal/GenericFunctions.ts
View file

@ -37,7 +37,6 @@ export async function calApiRequest(
try {
return await this.helpers.httpRequestWithAuthentication.call(this, 'calApi', options);
} catch (error) {
if (error instanceof NodeApiError) throw error;
throw new NodeApiError(this.getNode(), error as JsonObject);
}
}

2
packages/nodes-base/nodes/Coda/Coda.node.ts
View file

@ -435,7 +435,6 @@ export class Coda implements INodeType {
});
continue;
}
if (error instanceof NodeApiError) throw error;
throw new NodeApiError(this.getNode(), error as JsonObject);
}
}
@ -803,7 +802,6 @@ export class Coda implements INodeType {
});
continue;
}
if (error instanceof NodeApiError) throw error;
throw new NodeApiError(this.getNode(), error as JsonObject);
}
}

5
packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
View file

@ -276,6 +276,11 @@ export class GetResponse implements INodeType {
if (updateFields.customFieldsUi) {
const customFieldValues = (updateFields.customFieldsUi as IDataObject)
.customFieldValues as IDataObject[];
customFieldValues.forEach((entry) => {
if (typeof entry.value === 'string') {
entry.value = entry.value.split(',').map((value) => value.trim());
}
});
if (customFieldValues) {
body.customFieldValues = customFieldValues;
delete body.customFieldsUi;

2
packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
View file

@ -57,8 +57,6 @@ export async function googleApiRequest(
);
}
} catch (error) {
if (error instanceof NodeApiError) throw error;
if (error.code === 'ERR_OSSL_PEM_NO_START_LINE') {
error.statusCode = '401';
}

14
packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
View file

@ -1869,8 +1869,20 @@ export class HttpRequestV3 implements INodeType {
if (autoDetectResponseFormat && responseData.reason.error instanceof Buffer) {
responseData.reason.error = Buffer.from(responseData.reason.error as Buffer).toString();
}
const error = new NodeApiError(this.getNode(), responseData as JsonObject, { itemIndex });
let error;
if (responseData?.reason instanceof NodeApiError) {
error = responseData.reason;
set(error, 'context.itemIndex', itemIndex);
} else {
const errorData = (
responseData.reason ? responseData.reason : responseData
) as JsonObject;
error = new NodeApiError(this.getNode(), errorData, { itemIndex });
}
set(error, 'context.request', sanitizedRequests[itemIndex]);
throw error;
} else {
removeCircularRefs(responseData.reason as JsonObject);

1
packages/nodes-base/nodes/UProc/GenericFunctions.ts
View file

@ -27,7 +27,6 @@ export async function uprocApiRequest(
try {
return await this.helpers.httpRequestWithAuthentication.call(this, 'uprocApi', options);
} catch (error) {
if (error instanceof NodeApiError) throw error;
throw new NodeApiError(this.getNode(), error as JsonObject);
}
}

13
packages/workflow/src/errors/abstract/node.error.ts
View file

@ -1,4 +1,4 @@
import { isTraversableObject } from '../../utils';
import { isTraversableObject, jsonParse } from '../../utils';
import type { IDataObject, INode, JsonObject } from '@/Interfaces';
import { ExecutionBaseError } from './execution-base.error';
@ -81,9 +81,16 @@ export abstract class NodeError extends ExecutionBaseError {
traversalKeys: string[] = [],
): string | null {
for (const key of potentialKeys) {
const value = jsonError[key];
let value = jsonError[key];
if (value) {
if (typeof value === 'string') return value;
if (typeof value === 'string') {
try {
value = jsonParse(value);
} catch (error) {
return value as string;
}
if (typeof value === 'string') return value;
}
if (typeof value === 'number') return value.toString();
if (Array.isArray(value)) {
const resolvedErrors: string[] = value

30
packages/workflow/src/errors/node-api.error.ts
View file

@ -39,8 +39,9 @@ interface NodeApiErrorOptions extends NodeOperationErrorOptions {
/**
* Top-level properties where an error message can be found in an API response.
* order is important, precedence is from top to bottom
*/
const ERROR_MESSAGE_PROPERTIES = [
const POSSIBLE_ERROR_MESSAGE_KEYS = [
'cause',
'error',
'message',
@ -60,6 +61,7 @@ const ERROR_MESSAGE_PROPERTIES = [
'errorDescription',
'error_description',
'error_summary',
'error_info',
'title',
'text',
'field',
@ -67,10 +69,15 @@ const ERROR_MESSAGE_PROPERTIES = [
'type',
];
/**
* Properties where a nested object can be found in an API response.
*/
const POSSIBLE_NESTED_ERROR_OBJECT_KEYS = ['Error', 'error', 'err', 'response', 'body', 'data'];
/**
* Top-level properties where an HTTP error code can be found in an API response.
*/
const ERROR_STATUS_PROPERTIES = [
const POSSIBLE_ERROR_STATUS_KEYS = [
'statusCode',
'status',
'code',
@ -79,11 +86,6 @@ const ERROR_STATUS_PROPERTIES = [
'error_code',
];
/**
* Properties where a nested object can be found in an API response.
*/
const ERROR_NESTING_PROPERTIES = ['error', 'err', 'response', 'body', 'data'];
/**
* Descriptive messages for common HTTP status codes
* this is used by NodeApiError class
@ -187,7 +189,11 @@ export class NodeApiError extends NodeError {
this.httpCode = errorResponse.httpCode as string;
} else {
this.httpCode =
this.findProperty(errorResponse, ERROR_STATUS_PROPERTIES, ERROR_NESTING_PROPERTIES) ?? null;
this.findProperty(
errorResponse,
POSSIBLE_ERROR_STATUS_KEYS,
POSSIBLE_NESTED_ERROR_OBJECT_KEYS,
) ?? null;
}
this.level = level ?? 'warning';
@ -222,8 +228,8 @@ export class NodeApiError extends NodeError {
} else {
this.description = this.findProperty(
errorResponse,
ERROR_MESSAGE_PROPERTIES,
ERROR_NESTING_PROPERTIES,
POSSIBLE_ERROR_MESSAGE_KEYS,
POSSIBLE_NESTED_ERROR_OBJECT_KEYS,
);
}
}
@ -266,8 +272,8 @@ export class NodeApiError extends NodeError {
const topLevelKey = Object.keys(result)[0];
this.description = this.findProperty(
result[topLevelKey],
ERROR_MESSAGE_PROPERTIES,
['Error'].concat(ERROR_NESTING_PROPERTIES),
POSSIBLE_ERROR_MESSAGE_KEYS,
POSSIBLE_NESTED_ERROR_OBJECT_KEYS,
);
});
}