admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(core): Switch plain errors in core to ApplicationError (no-changelog) (#7873)

Browse Source 
Ensure all errors in `core` are `ApplicationError` or children of it and
contain no variables in the message, to continue normalizing all the
errors we report to Sentry

Follow-up to: https://github.com/n8n-io/n8n/pull/7857
This commit is contained in:
Iván Ovejero
2023-11-30 09:06:19 +01:00
committed by GitHub
parent cd474f1562
commit b16dd21909
10 changed files with 135 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/core/src/DirectoryLoader.ts
View File

@@ -14,6 +14,7 @@ import type {
KnownNodesAndCredentials,
} from 'n8n-workflow';
import {
ApplicationError,
LoggerProxy as Logger,
getCredentialsForNode,
getVersionedNodeTypeAll,
@@ -116,8 +117,9 @@ export abstract class DirectoryLoader {
nodeVersion = tempNode.currentVersion;
if (currentVersionNode.hasOwnProperty('executeSingle')) {
throw new Error(
`"executeSingle" has been removed. Please update the code of node "${this.packageName}.${nodeName}" to use "execute" instead!`,
throw new ApplicationError(
'"executeSingle" has been removed. Please update the code of this node to use "execute" instead!',
{ extra: { nodeName: `${this.packageName}.${nodeName}` } },
);
}
} else {
@@ -156,10 +158,10 @@ export abstract class DirectoryLoader {
}
}
protected loadCredentialFromFile(credentialName: string, filePath: string): void {
protected loadCredentialFromFile(credentialClassName: string, filePath: string): void {
let tempCredential: ICredentialType;
try {
tempCredential = loadClassInIsolation(filePath, credentialName);
tempCredential = loadClassInIsolation(filePath, credentialClassName);
// Add serializer method "toJSON" to the class so that authenticate method (if defined)
// gets mapped to the authenticate attribute before it is sent to the client.
@@ -170,8 +172,9 @@ export abstract class DirectoryLoader {
this.fixIconPath(tempCredential, filePath);
} catch (e) {
if (e instanceof TypeError) {
throw new Error(
`Class with name "${credentialName}" could not be found. Please check if the class is named correctly!`,
throw new ApplicationError(
'Class could not be found. Please check if the class is named correctly.',
{ extra: { credentialClassName } },
);
} else {
throw e;
@@ -179,7 +182,7 @@ export abstract class DirectoryLoader {
}
this.known.credentials[tempCredential.name] = {
className: credentialName,
className: credentialClassName,
sourcePath: filePath,
extends: tempCredential.extends,
supportedNodes: this.nodesByCredential[tempCredential.name],
@@ -366,7 +369,7 @@ export class PackageDirectoryLoader extends DirectoryLoader {
try {
return jsonParse<T>(fileString);
} catch (error) {
throw new Error(`Failed to parse JSON from ${filePath}`);
throw new ApplicationError('Failed to parse JSON', { extra: { filePath } });
}
}
}