refactor(core): Simplify main pubsub message handler (#11156)

This commit is contained in:
Iván Ovejero
2024-10-11 10:31:33 +02:00
committed by GitHub
parent 4aaebfd435
commit 0820cb5ab9
21 changed files with 813 additions and 531 deletions

View File

@@ -1,15 +1,25 @@
import type { WorkerStatus } from '@n8n/api-types';
import { mock } from 'jest-mock-extended';
import type { InstanceSettings } from 'n8n-core';
import type { Workflow } from 'n8n-workflow';
import type { ActiveWorkflowManager } from '@/active-workflow-manager';
import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
import { EventService } from '@/events/event.service';
import type { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
import type { IWorkflowDb } from '@/interfaces';
import type { License } from '@/license';
import type { Push } from '@/push';
import type { WebSocketPush } from '@/push/websocket.push';
import type { CommunityPackagesService } from '@/services/community-packages.service';
import type { TestWebhooks } from '@/webhooks/test-webhooks';
import type { Publisher } from '../pubsub/publisher.service';
import { PubSubHandler } from '../pubsub/pubsub-handler';
import type { WorkerStatus } from '../worker-status';
import type { WorkerStatusService } from '../worker-status.service';
const flushPromises = async () => await new Promise((resolve) => setImmediate(resolve));
describe('PubSubHandler', () => {
const eventService = new EventService();
@@ -18,7 +28,11 @@ describe('PubSubHandler', () => {
const externalSecretsManager = mock<ExternalSecretsManager>();
const communityPackagesService = mock<CommunityPackagesService>();
const publisher = mock<Publisher>();
const workerStatus = mock<WorkerStatus>();
const workerStatusService = mock<WorkerStatusService>();
const activeWorkflowManager = mock<ActiveWorkflowManager>();
const push = mock<Push>();
const workflowRepository = mock<WorkflowRepository>();
const testWebhooks = mock<TestWebhooks>();
afterEach(() => {
eventService.removeAllListeners();
@@ -29,7 +43,7 @@ describe('PubSubHandler', () => {
it('should set up handlers in webhook process', () => {
// @ts-expect-error Spying on private method
const setupHandlersSpy = jest.spyOn(PubSubHandler.prototype, 'setupHandlers');
const setupHandlers = jest.spyOn(PubSubHandler.prototype, 'setupHandlers');
new PubSubHandler(
eventService,
@@ -39,10 +53,14 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
expect(setupHandlersSpy).toHaveBeenCalledWith({
expect(setupHandlers).toHaveBeenCalledWith({
'reload-license': expect.any(Function),
'restart-event-bus': expect.any(Function),
'reload-external-secrets-providers': expect.any(Function),
@@ -61,7 +79,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('reload-license');
@@ -78,7 +100,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('restart-event-bus');
@@ -95,7 +121,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('reload-external-secrets-providers');
@@ -112,7 +142,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('community-package-install', {
@@ -135,7 +169,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('community-package-update', {
@@ -158,7 +196,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('community-package-uninstall', {
@@ -184,7 +226,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
expect(setupHandlersSpy).toHaveBeenCalledWith({
@@ -207,7 +253,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('reload-license');
@@ -224,7 +274,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('restart-event-bus');
@@ -241,7 +295,11 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('reload-external-secrets-providers');
@@ -249,6 +307,83 @@ describe('PubSubHandler', () => {
expect(externalSecretsManager.reloadAllProviders).toHaveBeenCalled();
});
it('should install community package on `community-package-install` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('community-package-install', {
packageName: 'test-package',
packageVersion: '1.0.0',
});
expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
'test-package',
'1.0.0',
);
});
it('should update community package on `community-package-update` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('community-package-update', {
packageName: 'test-package',
packageVersion: '1.0.0',
});
expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
'test-package',
'1.0.0',
);
});
it('should uninstall community package on `community-package-uninstall` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('community-package-uninstall', {
packageName: 'test-package',
});
expect(communityPackagesService.removeNpmPackage).toHaveBeenCalledWith('test-package');
});
it('should generate status on `get-worker-status` event', () => {
new PubSubHandler(
eventService,
@@ -258,12 +393,486 @@ describe('PubSubHandler', () => {
externalSecretsManager,
communityPackagesService,
publisher,
workerStatus,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('get-worker-status');
expect(workerStatus.generateStatus).toHaveBeenCalled();
expect(workerStatusService.generateStatus).toHaveBeenCalled();
});
});
describe('in main process', () => {
const instanceSettings = mock<InstanceSettings>({
instanceType: 'main',
isLeader: true,
isFollower: false,
});
afterEach(() => {
jest.clearAllMocks();
});
it('should set up command and worker response handlers in main process', () => {
// @ts-expect-error Spying on private method
const setupHandlersSpy = jest.spyOn(PubSubHandler.prototype, 'setupHandlers');
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
expect(setupHandlersSpy).toHaveBeenCalledWith({
'reload-license': expect.any(Function),
'restart-event-bus': expect.any(Function),
'reload-external-secrets-providers': expect.any(Function),
'community-package-install': expect.any(Function),
'community-package-update': expect.any(Function),
'community-package-uninstall': expect.any(Function),
'add-webhooks-triggers-and-pollers': expect.any(Function),
'remove-triggers-and-pollers': expect.any(Function),
'display-workflow-activation': expect.any(Function),
'display-workflow-deactivation': expect.any(Function),
'display-workflow-activation-error': expect.any(Function),
'relay-execution-lifecycle-event': expect.any(Function),
'clear-test-webhooks': expect.any(Function),
'response-to-get-worker-status': expect.any(Function),
});
});
it('should reload license on `reload-license` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('reload-license');
expect(license.reload).toHaveBeenCalled();
});
it('should restart event bus on `restart-event-bus` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('restart-event-bus');
expect(eventbus.restart).toHaveBeenCalled();
});
it('should reload providers on `reload-external-secrets-providers` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('reload-external-secrets-providers');
expect(externalSecretsManager.reloadAllProviders).toHaveBeenCalled();
});
it('should install community package on `community-package-install` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('community-package-install', {
packageName: 'test-package',
packageVersion: '1.0.0',
});
expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
'test-package',
'1.0.0',
);
});
it('should update community package on `community-package-update` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('community-package-update', {
packageName: 'test-package',
packageVersion: '1.0.0',
});
expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
'test-package',
'1.0.0',
);
});
it('should uninstall community package on `community-package-uninstall` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
eventService.emit('community-package-uninstall', {
packageName: 'test-package',
});
expect(communityPackagesService.removeNpmPackage).toHaveBeenCalledWith('test-package');
});
describe('multi-main setup', () => {
it('if leader, should handle `add-webhooks-triggers-and-pollers` event', async () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const workflowId = 'test-workflow-id';
eventService.emit('add-webhooks-triggers-and-pollers', { workflowId });
await flushPromises();
expect(activeWorkflowManager.add).toHaveBeenCalledWith(workflowId, 'activate', undefined, {
shouldPublish: false,
});
expect(push.broadcast).toHaveBeenCalledWith('workflowActivated', { workflowId });
expect(publisher.publishCommand).toHaveBeenCalledWith({
command: 'display-workflow-activation',
payload: { workflowId },
});
});
it('if follower, should skip `add-webhooks-triggers-and-pollers` event', async () => {
new PubSubHandler(
eventService,
mock<InstanceSettings>({ instanceType: 'main', isLeader: false, isFollower: true }),
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const workflowId = 'test-workflow-id';
eventService.emit('add-webhooks-triggers-and-pollers', { workflowId });
await flushPromises();
expect(activeWorkflowManager.add).not.toHaveBeenCalled();
expect(push.broadcast).not.toHaveBeenCalled();
expect(publisher.publishCommand).not.toHaveBeenCalled();
});
it('if leader, should handle `remove-triggers-and-pollers` event', async () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const workflowId = 'test-workflow-id';
eventService.emit('remove-triggers-and-pollers', { workflowId });
await flushPromises();
expect(activeWorkflowManager.removeActivationError).toHaveBeenCalledWith(workflowId);
expect(activeWorkflowManager.removeWorkflowTriggersAndPollers).toHaveBeenCalledWith(
workflowId,
);
expect(push.broadcast).toHaveBeenCalledWith('workflowDeactivated', { workflowId });
expect(publisher.publishCommand).toHaveBeenCalledWith({
command: 'display-workflow-deactivation',
payload: { workflowId },
});
});
it('if follower, should skip `remove-triggers-and-pollers` event', async () => {
new PubSubHandler(
eventService,
mock<InstanceSettings>({ instanceType: 'main', isLeader: false, isFollower: true }),
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const workflowId = 'test-workflow-id';
eventService.emit('remove-triggers-and-pollers', { workflowId });
await flushPromises();
expect(activeWorkflowManager.removeActivationError).not.toHaveBeenCalled();
expect(activeWorkflowManager.removeWorkflowTriggersAndPollers).not.toHaveBeenCalled();
expect(push.broadcast).not.toHaveBeenCalled();
expect(publisher.publishCommand).not.toHaveBeenCalled();
});
it('should handle `display-workflow-activation` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const workflowId = 'test-workflow-id';
eventService.emit('display-workflow-activation', { workflowId });
expect(push.broadcast).toHaveBeenCalledWith('workflowActivated', { workflowId });
});
it('should handle `display-workflow-deactivation` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const workflowId = 'test-workflow-id';
eventService.emit('display-workflow-deactivation', { workflowId });
expect(push.broadcast).toHaveBeenCalledWith('workflowDeactivated', { workflowId });
});
it('should handle `display-workflow-activation-error` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const workflowId = 'test-workflow-id';
const errorMessage = 'Test error message';
eventService.emit('display-workflow-activation-error', { workflowId, errorMessage });
expect(push.broadcast).toHaveBeenCalledWith('workflowFailedToActivate', {
workflowId,
errorMessage,
});
});
it('should handle `relay-execution-lifecycle-event` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const pushRef = 'test-push-ref';
const type = 'executionStarted';
const args = { testArg: 'value' };
push.getBackend.mockReturnValue(
mock<WebSocketPush>({ hasPushRef: jest.fn().mockReturnValue(true) }),
);
eventService.emit('relay-execution-lifecycle-event', { type, args, pushRef });
expect(push.send).toHaveBeenCalledWith(type, args, pushRef);
});
it('should handle `clear-test-webhooks` event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const webhookKey = 'test-webhook-key';
const workflowEntity = mock<IWorkflowDb>({ id: 'test-workflow-id' });
const pushRef = 'test-push-ref';
push.getBackend.mockReturnValue(
mock<WebSocketPush>({ hasPushRef: jest.fn().mockReturnValue(true) }),
);
testWebhooks.toWorkflow.mockReturnValue(mock<Workflow>({ id: 'test-workflow-id' }));
eventService.emit('clear-test-webhooks', { webhookKey, workflowEntity, pushRef });
expect(testWebhooks.clearTimeout).toHaveBeenCalledWith(webhookKey);
expect(testWebhooks.deactivateWebhooks).toHaveBeenCalled();
});
it('should handle `response-to-get-worker-status event', () => {
new PubSubHandler(
eventService,
instanceSettings,
license,
eventbus,
externalSecretsManager,
communityPackagesService,
publisher,
workerStatusService,
activeWorkflowManager,
push,
workflowRepository,
testWebhooks,
).init();
const workerStatus = mock<WorkerStatus>({ senderId: 'worker-1', loadAvg: [123] });
eventService.emit('response-to-get-worker-status', workerStatus);
expect(push.broadcast).toHaveBeenCalledWith('sendWorkerStatusMessage', {
workerId: workerStatus.senderId,
status: workerStatus,
});
});
});
});
});