refactor(core): Refactor nodes loading (no-changelog)

.dockerignore

@@ -11,4 +11,3 @@ packages/**/.turbo
 .github
 *.tsbuildinfo
 packages/cli/dist/**/e2e.*
-packages/cli/dist/ReloadNodesAndCredentials.*

packages/cli/package.json

@@ -61,8 +61,7 @@
     "templates",
     "dist",
     "oclif.manifest.json",
-    "!dist/**/e2e.*",
-    "!dist/ReloadNodesAndCredentials.*"
+    "!dist/**/e2e.*"
   ],
   "devDependencies": {
     "@apidevtools/swagger-cli": "4.0.0",

packages/cli/src/CredentialTypes.ts

@@ -1,32 +1,31 @@
+import { Service } from 'typedi';
 import { loadClassInIsolation } from 'n8n-core';
 import type { ICredentialType, ICredentialTypes, LoadedClass } from 'n8n-workflow';
-import { Service } from 'typedi';
-import { RESPONSE_ERROR_MESSAGES } from './constants';
-import { LoadNodesAndCredentials } from './LoadNodesAndCredentials';
+import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
 @Service()
 export class CredentialTypes implements ICredentialTypes {
-	constructor(private nodesAndCredentials: LoadNodesAndCredentials) {
-		nodesAndCredentials.credentialTypes = this;
-	}
+	constructor(private loadNodesAndCredentials: LoadNodesAndCredentials) {}
 
 	recognizes(type: string) {
-		return type in this.knownCredentials || type in this.loadedCredentials;
+		const { loadedCredentials, knownCredentials } = this.loadNodesAndCredentials;
+		return type in knownCredentials || type in loadedCredentials;
 	}
 
 	getByName(credentialType: string): ICredentialType {
 		return this.getCredential(credentialType).type;
 	}
 
 	getNodeTypesToTestWith(type: string): string[] {
-		return this.knownCredentials[type]?.nodesToTestWith ?? [];
+		return this.loadNodesAndCredentials.knownCredentials[type]?.nodesToTestWith ?? [];
 	}
 
 	/**
 	 * Returns all parent types of the given credential type
 	 */
 	getParentTypes(typeName: string): string[] {
-		const extendsArr = this.knownCredentials[typeName]?.extends ?? [];
+		const extendsArr = this.loadNodesAndCredentials.knownCredentials[typeName]?.extends ?? [];
 		if (extendsArr.length) {
 			extendsArr.forEach((type) => {
 				extendsArr.push(...this.getParentTypes(type));
@@ -36,12 +35,11 @@ export class CredentialTypes implements ICredentialTypes {
 	}
 
 	private getCredential(type: string): LoadedClass<ICredentialType> {
-		const loadedCredentials = this.loadedCredentials;
+		const { loadedCredentials, knownCredentials } = this.loadNodesAndCredentials;
 		if (type in loadedCredentials) {
 			return loadedCredentials[type];
 		}
 
-		const knownCredentials = this.knownCredentials;
 		if (type in knownCredentials) {
 			const { className, sourcePath } = knownCredentials[type];
 			const loaded: ICredentialType = loadClassInIsolation(sourcePath, className);
@@ -50,12 +48,4 @@ export class CredentialTypes implements ICredentialTypes {
 		}
 		throw new Error(`${RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL}: ${type}`);
 	}
-
-	private get loadedCredentials() {
-		return this.nodesAndCredentials.loaded.credentials;
-	}
-
-	private get knownCredentials() {
-		return this.nodesAndCredentials.known.credentials;
-	}
 }

packages/cli/src/CredentialsHelper.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
@@ -89,13 +88,11 @@ const mockNodeTypes: INodeTypes = {
 };
 
 export class CredentialsHelper extends ICredentialsHelper {
-	constructor(
-		encryptionKey: string,
-		private credentialTypes = Container.get(CredentialTypes),
-		private nodeTypes = Container.get(NodeTypes),
-	) {
-		super(encryptionKey);
-	}
+	private credentialTypes = Container.get(CredentialTypes);
+
+	private nodeTypes = Container.get(NodeTypes);
+
+	private credentialsOverwrites = Container.get(CredentialsOverwrites);
 
 	/**
 	 * Add the required authentication information to the request
@@ -388,7 +385,10 @@ export class CredentialsHelper extends ICredentialsHelper {
 		const credentialsProperties = this.getCredentialsProperties(type);
 
 		// Load and apply the credentials overwrites if any exist
-		const dataWithOverwrites = CredentialsOverwrites().applyOverwrite(type, decryptedDataOriginal);
+		const dataWithOverwrites = this.credentialsOverwrites.applyOverwrite(
+			type,
+			decryptedDataOriginal,
+		);
 
 		// Add the default credential values
 		let decryptedData = NodeHelpers.getNodeParameters(

packages/cli/src/CredentialsOverwrites.ts

@@ -1,14 +1,17 @@
-import config from '@/config';
+import { Service } from 'typedi';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
-import { deepCopy, LoggerProxy as Logger, jsonParse, ICredentialTypes } from 'n8n-workflow';
+import { deepCopy, LoggerProxy as Logger, jsonParse } from 'n8n-workflow';
+import config from '@/config';
 import type { ICredentialsOverwrite } from '@/Interfaces';
+import { CredentialTypes } from '@/CredentialTypes';
 
-class CredentialsOverwritesClass {
+@Service()
+export class CredentialsOverwrites {
 	private overwriteData: ICredentialsOverwrite = {};
 
 	private resolvedTypes: string[] = [];
 
-	constructor(private credentialTypes: ICredentialTypes) {
+	constructor(private credentialTypes: CredentialTypes) {
 		const data = config.getEnv('credentials.overwrite.data');
 		const overwriteData = jsonParse<ICredentialsOverwrite>(data, {
 			errorMessage: 'The credentials-overwrite is not valid JSON.',
@@ -96,20 +99,3 @@ class CredentialsOverwritesClass {
 		return this.overwriteData;
 	}
 }
-
-let credentialsOverwritesInstance: CredentialsOverwritesClass | undefined;
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export function CredentialsOverwrites(
-	credentialTypes?: ICredentialTypes,
-): CredentialsOverwritesClass {
-	if (!credentialsOverwritesInstance) {
-		if (credentialTypes) {
-			credentialsOverwritesInstance = new CredentialsOverwritesClass(credentialTypes);
-		} else {
-			throw new Error('CredentialsOverwrites not initialized yet');
-		}
-	}
-
-	return credentialsOverwritesInstance;
-}