mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-09 22:24:05 -08:00
refactor(core): Remove event bus channel (no-changelog) (#9663)
This commit is contained in:
parent
cc4e46eae4
commit
aaa78435b0
|
@ -273,7 +273,7 @@ export class Worker extends BaseCommand {
|
|||
await this.initOrchestration();
|
||||
this.logger.debug('Orchestration init complete');
|
||||
|
||||
await Container.get(OrchestrationWorkerService).publishToEventLog(
|
||||
await Container.get(MessageEventBus).send(
|
||||
new EventMessageGeneric({
|
||||
eventName: 'n8n.worker.started',
|
||||
payload: {
|
||||
|
|
|
@ -3,7 +3,6 @@ import type { DeleteResult } from '@n8n/typeorm';
|
|||
import { In } from '@n8n/typeorm';
|
||||
import EventEmitter from 'events';
|
||||
import uniqby from 'lodash/uniqBy';
|
||||
import { jsonParse } from 'n8n-workflow';
|
||||
import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
|
||||
|
||||
import config from '@/config';
|
||||
|
@ -28,8 +27,6 @@ import {
|
|||
EventMessageGeneric,
|
||||
eventMessageGenericDestinationTestEvent,
|
||||
} from '../EventMessageClasses/EventMessageGeneric';
|
||||
import type { AbstractEventMessageOptions } from '../EventMessageClasses/AbstractEventMessageOptions';
|
||||
import { getEventMessageObjectByType } from '../EventMessageClasses/Helpers';
|
||||
import { ExecutionRecoveryService } from '../../executions/execution-recovery.service';
|
||||
import {
|
||||
EventMessageAiNode,
|
||||
|
@ -246,17 +243,6 @@ export class MessageEventBus extends EventEmitter {
|
|||
return result;
|
||||
}
|
||||
|
||||
async handleRedisEventBusMessage(messageString: string) {
|
||||
const eventData = jsonParse<AbstractEventMessageOptions>(messageString);
|
||||
if (eventData) {
|
||||
const eventMessage = getEventMessageObjectByType(eventData);
|
||||
if (eventMessage) {
|
||||
await this.send(eventMessage);
|
||||
}
|
||||
}
|
||||
return eventData;
|
||||
}
|
||||
|
||||
private async trySendingUnsent(msgs?: EventMessageTypes[]) {
|
||||
const unsentMessages = msgs ?? (await this.getEventsUnsent());
|
||||
if (unsentMessages.length > 0) {
|
||||
|
|
|
@ -1,12 +1,10 @@
|
|||
import Container, { Service } from 'typedi';
|
||||
import { Service } from 'typedi';
|
||||
import {
|
||||
COMMAND_REDIS_CHANNEL,
|
||||
EVENT_BUS_REDIS_CHANNEL,
|
||||
WORKER_RESPONSE_REDIS_CHANNEL,
|
||||
} from '../../redis/RedisServiceHelper';
|
||||
import { handleWorkerResponseMessageMain } from './handleWorkerResponseMessageMain';
|
||||
import { handleCommandMessageMain } from './handleCommandMessageMain';
|
||||
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
|
||||
import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
|
||||
|
||||
@Service()
|
||||
|
@ -16,7 +14,6 @@ export class OrchestrationHandlerMainService extends OrchestrationHandlerService
|
|||
|
||||
await this.redisSubscriber.subscribeToCommandChannel();
|
||||
await this.redisSubscriber.subscribeToWorkerResponseChannel();
|
||||
await this.redisSubscriber.subscribeToEventLog();
|
||||
|
||||
this.redisSubscriber.addMessageHandler(
|
||||
'OrchestrationMessageReceiver',
|
||||
|
@ -25,8 +22,6 @@ export class OrchestrationHandlerMainService extends OrchestrationHandlerService
|
|||
await handleWorkerResponseMessageMain(messageString);
|
||||
} else if (channel === COMMAND_REDIS_CHANNEL) {
|
||||
await handleCommandMessageMain(messageString);
|
||||
} else if (channel === EVENT_BUS_REDIS_CHANNEL) {
|
||||
await Container.get(MessageEventBus).handleRedisEventBusMessage(messageString);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
import { Service } from 'typedi';
|
||||
import type { AbstractEventMessage } from '@/eventbus/EventMessageClasses/AbstractEventMessage';
|
||||
import { OrchestrationService } from '../../orchestration.service';
|
||||
import config from '@/config';
|
||||
|
||||
|
@ -12,9 +11,4 @@ export class OrchestrationWorkerService extends OrchestrationService {
|
|||
config.get('generic.instanceType') === 'worker'
|
||||
);
|
||||
}
|
||||
|
||||
async publishToEventLog(message: AbstractEventMessage) {
|
||||
if (!this.sanityCheck()) return;
|
||||
await this.redisPublisher.publishToEventLog(message);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,7 +8,6 @@ import { Logger } from '@/Logger';
|
|||
export const EVENT_BUS_REDIS_STREAM = 'n8n:eventstream';
|
||||
export const COMMAND_REDIS_STREAM = 'n8n:commandstream';
|
||||
export const WORKER_RESPONSE_REDIS_STREAM = 'n8n:workerstream';
|
||||
export const EVENT_BUS_REDIS_CHANNEL = 'n8n.events';
|
||||
export const COMMAND_REDIS_CHANNEL = 'n8n.commands';
|
||||
export const WORKER_RESPONSE_REDIS_CHANNEL = 'n8n.worker-response';
|
||||
export const WORKER_RESPONSE_REDIS_LIST = 'n8n:list:worker-response';
|
||||
|
|
|
@ -1,10 +1,5 @@
|
|||
import { Service } from 'typedi';
|
||||
import type { AbstractEventMessage } from '@/eventbus/EventMessageClasses/AbstractEventMessage';
|
||||
import {
|
||||
COMMAND_REDIS_CHANNEL,
|
||||
EVENT_BUS_REDIS_CHANNEL,
|
||||
WORKER_RESPONSE_REDIS_CHANNEL,
|
||||
} from './RedisServiceHelper';
|
||||
import { COMMAND_REDIS_CHANNEL, WORKER_RESPONSE_REDIS_CHANNEL } from './RedisServiceHelper';
|
||||
import type {
|
||||
RedisServiceCommandObject,
|
||||
RedisServiceWorkerResponseObject,
|
||||
|
@ -24,10 +19,6 @@ export class RedisServicePubSubPublisher extends RedisServiceBaseSender {
|
|||
await this.redisClient?.publish(channel, message);
|
||||
}
|
||||
|
||||
async publishToEventLog(message: AbstractEventMessage): Promise<void> {
|
||||
await this.publish(EVENT_BUS_REDIS_CHANNEL, message.toString());
|
||||
}
|
||||
|
||||
async publishToCommandChannel(
|
||||
message: Omit<RedisServiceCommandObject, 'senderId'>,
|
||||
): Promise<void> {
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
import { Service } from 'typedi';
|
||||
import {
|
||||
COMMAND_REDIS_CHANNEL,
|
||||
EVENT_BUS_REDIS_CHANNEL,
|
||||
WORKER_RESPONSE_REDIS_CHANNEL,
|
||||
} from './RedisServiceHelper';
|
||||
import { COMMAND_REDIS_CHANNEL, WORKER_RESPONSE_REDIS_CHANNEL } from './RedisServiceHelper';
|
||||
import { RedisServiceBaseReceiver } from './RedisServiceBaseClasses';
|
||||
|
||||
@Service()
|
||||
|
@ -44,10 +40,6 @@ export class RedisServicePubSubSubscriber extends RedisServiceBaseReceiver {
|
|||
});
|
||||
}
|
||||
|
||||
async subscribeToEventLog(): Promise<void> {
|
||||
await this.subscribe(EVENT_BUS_REDIS_CHANNEL);
|
||||
}
|
||||
|
||||
async subscribeToCommandChannel(): Promise<void> {
|
||||
await this.subscribe(COMMAND_REDIS_CHANNEL);
|
||||
}
|
||||
|
@ -56,10 +48,6 @@ export class RedisServicePubSubSubscriber extends RedisServiceBaseReceiver {
|
|||
await this.subscribe(WORKER_RESPONSE_REDIS_CHANNEL);
|
||||
}
|
||||
|
||||
async unSubscribeFromEventLog(): Promise<void> {
|
||||
await this.unsubscribe(EVENT_BUS_REDIS_CHANNEL);
|
||||
}
|
||||
|
||||
async unSubscribeFromCommandChannel(): Promise<void> {
|
||||
await this.unsubscribe(COMMAND_REDIS_CHANNEL);
|
||||
}
|
||||
|
|
|
@ -15,7 +15,6 @@ import { InternalHooks } from '@/InternalHooks';
|
|||
import { PostHogClient } from '@/posthog';
|
||||
import { RedisService } from '@/services/redis.service';
|
||||
import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service';
|
||||
import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
|
||||
import { OrchestrationService } from '@/services/orchestration.service';
|
||||
|
||||
import * as testDb from '../shared/testDb';
|
||||
|
@ -23,6 +22,8 @@ import { mockInstance } from '../../shared/mocking';
|
|||
|
||||
const oclifConfig = new Config({ root: __dirname });
|
||||
|
||||
let eventBus: MessageEventBus;
|
||||
|
||||
beforeAll(async () => {
|
||||
config.set('executions.mode', 'queue');
|
||||
config.set('binaryDataManager.availableModes', 'filesystem');
|
||||
|
@ -32,7 +33,7 @@ beforeAll(async () => {
|
|||
mockInstance(CacheService);
|
||||
mockInstance(ExternalSecretsManager);
|
||||
mockInstance(BinaryDataService);
|
||||
mockInstance(MessageEventBus);
|
||||
eventBus = mockInstance(MessageEventBus);
|
||||
mockInstance(LoadNodesAndCredentials);
|
||||
mockInstance(CredentialTypes);
|
||||
mockInstance(NodeTypes);
|
||||
|
@ -58,9 +59,7 @@ test('worker initializes all its components', async () => {
|
|||
jest.spyOn(worker, 'initExternalSecrets').mockImplementation(async () => {});
|
||||
jest.spyOn(worker, 'initEventBus').mockImplementation(async () => {});
|
||||
jest.spyOn(worker, 'initOrchestration');
|
||||
jest
|
||||
.spyOn(OrchestrationWorkerService.prototype, 'publishToEventLog')
|
||||
.mockImplementation(async () => {});
|
||||
// jest.spyOn(MessageEventBus.prototype, 'send').mockImplementation(async () => {});
|
||||
jest
|
||||
.spyOn(OrchestrationHandlerWorkerService.prototype, 'initSubscriber')
|
||||
.mockImplementation(async () => {});
|
||||
|
@ -79,7 +78,7 @@ test('worker initializes all its components', async () => {
|
|||
expect(worker.initEventBus).toHaveBeenCalledTimes(1);
|
||||
expect(worker.initOrchestration).toHaveBeenCalledTimes(1);
|
||||
expect(OrchestrationHandlerWorkerService.prototype.initSubscriber).toHaveBeenCalledTimes(1);
|
||||
expect(OrchestrationWorkerService.prototype.publishToEventLog).toHaveBeenCalledTimes(1);
|
||||
expect(eventBus.send).toHaveBeenCalledTimes(1);
|
||||
expect(worker.initQueue).toHaveBeenCalledTimes(1);
|
||||
|
||||
jest.restoreAllMocks();
|
||||
|
|
Loading…
Reference in a new issue