refactor(core): Remove more dead code from event bus (no-changelog) (#…

…9697)
n8n-io · Jun 11, 2024 · c0e4f69 · c0e4f69
1 parent 6ba789a
commit c0e4f69
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 106 deletions.
diff --git a/packages/cli/src/eventbus/EventMessageClasses/Helpers.ts b/packages/cli/src/eventbus/EventMessageClasses/Helpers.ts
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
@@ -6,10 +6,18 @@ import path, { parse } from 'path';
 import { Worker } from 'worker_threads';
 import { createReadStream, existsSync, rmSync } from 'fs';
 import readline from 'readline';
-import { jsonParse } from 'n8n-workflow';
 import remove from 'lodash/remove';
 import config from '@/config';
-import { getEventMessageObjectByType } from '../EventMessageClasses/Helpers';
+import type { EventMessageGenericOptions } from '../EventMessageClasses/EventMessageGeneric';
+import { EventMessageGeneric } from '../EventMessageClasses/EventMessageGeneric';
+import type { AbstractEventMessageOptions } from '../EventMessageClasses/AbstractEventMessageOptions';
+import type { EventMessageWorkflowOptions } from '../EventMessageClasses/EventMessageWorkflow';
+import { EventMessageWorkflow } from '../EventMessageClasses/EventMessageWorkflow';
+import { EventMessageTypeNames, jsonParse } from 'n8n-workflow';
+import type { EventMessageAuditOptions } from '../EventMessageClasses/EventMessageAudit';
+import { EventMessageAudit } from '../EventMessageClasses/EventMessageAudit';
+import type { EventMessageNodeOptions } from '../EventMessageClasses/EventMessageNode';
+import { EventMessageNode } from '../EventMessageClasses/EventMessageNode';
 import type { EventMessageReturnMode } from '../MessageEventBus/MessageEventBus';
 import type { EventMessageTypes } from '../EventMessageClasses';
 import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
@@ -200,7 +208,7 @@ export class MessageEventBusLogWriter {
 					try {
 						const json = jsonParse(line);
 						if (isEventMessageOptions(json) && json.__type !== undefined) {
-							const msg = getEventMessageObjectByType(json);
+							const msg = this.getEventMessageObjectByType(json);
 							if (msg !== null) results.loggedMessages.push(msg);
 							if (msg?.eventName && msg.payload?.executionId) {
 								const executionId = msg.payload.executionId as string;
@@ -302,7 +310,7 @@ export class MessageEventBusLogWriter {
 							json.__type !== undefined &&
 							json.payload?.executionId === executionId
 						) {
-							const msg = getEventMessageObjectByType(json);
+							const msg = this.getEventMessageObjectByType(json);
 							if (msg !== null) messages.push(msg);
 						}
 					} catch {
@@ -346,4 +354,19 @@ export class MessageEventBusLogWriter {
 			unfinishedExecutions: result.unfinishedExecutions,
 		};
 	}
+
+	getEventMessageObjectByType(message: AbstractEventMessageOptions): EventMessageTypes | null {
+		switch (message.__type as EventMessageTypeNames) {
+			case EventMessageTypeNames.generic:
+				return new EventMessageGeneric(message as EventMessageGenericOptions);
+			case EventMessageTypeNames.workflow:
+				return new EventMessageWorkflow(message as EventMessageWorkflowOptions);
+			case EventMessageTypeNames.audit:
+				return new EventMessageAudit(message as EventMessageAuditOptions);
+			case EventMessageTypeNames.node:
+				return new EventMessageNode(message as EventMessageNodeOptions);
+			default:
+				return null;
+		}
+	}
 }