mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-24 20:24:05 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor(core): Delete InternalHooks (no-changelog) (#10561)

Browse source 
Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2024-08-27 14:33:25 +02:00 committed by GitHub
parent 70b410f4b0
commit 1c40135043
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/cli/src/commands/base-command.ts
View file

@ -16,7 +16,6 @@ import { NodeTypes } from '@/node-types';
import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
import type { N8nInstanceType } from '@/Interfaces'; import type { N8nInstanceType } from '@/Interfaces';
import { PostHogClient } from '@/posthog'; import { PostHogClient } from '@/posthog';
import { InternalHooks } from '@/internal-hooks';
import { License } from '@/license'; import { License } from '@/license';
import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
import { initExpressionEvaluator } from '@/expression-evaluator'; import { initExpressionEvaluator } from '@/expression-evaluator';
@ -24,6 +23,7 @@ import { generateHostInstanceId } from '@db/utils/generators';
import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee'; import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee';
import { ShutdownService } from '@/shutdown/shutdown.service'; import { ShutdownService } from '@/shutdown/shutdown.service';
import { TelemetryEventRelay } from '@/events/telemetry-event-relay'; import { TelemetryEventRelay } from '@/events/telemetry-event-relay';
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
export abstract class BaseCommand extends Command { export abstract class BaseCommand extends Command {
protected logger = Container.get(Logger); protected logger = Container.get(Logger);
@ -120,8 +120,10 @@ export abstract class BaseCommand extends Command {
await Container.get(CommunityPackagesService).checkForMissingPackages(); await Container.get(CommunityPackagesService).checkForMissingPackages();
} }
// TODO: remove this after the cyclic dependencies around the event-bus are resolved
Container.get(MessageEventBus);
await Container.get(PostHogClient).init(); await Container.get(PostHogClient).init();
await Container.get(InternalHooks).init();
await Container.get(TelemetryEventRelay).init(); await Container.get(TelemetryEventRelay).init();
} }

24
packages/cli/src/internal-hooks.ts
View file

@ -1,24 +0,0 @@
import { Service } from 'typedi';
import { Telemetry } from '@/telemetry';
import { MessageEventBus } from './eventbus/message-event-bus/message-event-bus';
/**
* @deprecated Do not add to this class. It will be removed once we remove
* further dep cycles. To add log streaming or telemetry events, use
* `EventService` to emit the event and then use the `LogStreamingEventRelay` or
* `TelemetryEventRelay` to forward them to the event bus or telemetry.
*/
@Service()
export class InternalHooks {
constructor(
private readonly telemetry: Telemetry,
// Can't use @ts-expect-error because only dev time tsconfig considers this as an error, but not build time
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - needed until we decouple telemetry
private readonly _eventBus: MessageEventBus, // needed until we decouple telemetry
) {}
async init() {
await this.telemetry.init();
}
}

4
packages/cli/test/integration/shared/utils/testCommand.ts
View file

@ -6,9 +6,9 @@ import type { BaseCommand } from '@/commands/base-command';
import * as testDb from '../testDb'; import * as testDb from '../testDb';
import { TelemetryEventRelay } from '@/events/telemetry-event-relay'; import { TelemetryEventRelay } from '@/events/telemetry-event-relay';
import { mockInstance } from '@test/mocking'; import { mockInstance } from '@test/mocking';
import { InternalHooks } from '@/internal-hooks'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
mockInstance(InternalHooks); mockInstance(MessageEventBus);
export const setupTestCommand = <T extends BaseCommand>(Command: Class<T>) => { export const setupTestCommand = <T extends BaseCommand>(Command: Class<T>) => {
const config = mock<Config>(); const config = mock<Config>();