Skip to content

Commit 18279c9

Browse files
ivovriascho
ivov
authored and
riascho
committed
refactor(core): Rename some runners files and classes for clarity (#12410)
1 parent a1b0dcb commit 18279c9

File tree

51 files changed

+85
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+85
-83
lines changed

Diff for: ‎packages/cli/src/commands/start.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ export class Start extends BaseCommand {
225225

226226
const { taskRunners: taskRunnerConfig } = this.globalConfig;
227227
if (taskRunnerConfig.enabled) {
228-
const { TaskRunnerModule } = await import('@/runners/task-runner-module');
228+
const { TaskRunnerModule } = await import('@/task-runners/task-runner-module');
229229
const taskRunnerModule = Container.get(TaskRunnerModule);
230230
await taskRunnerModule.start();
231231
}

Diff for: ‎packages/cli/src/commands/worker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export class Worker extends BaseCommand {
113113

114114
const { taskRunners: taskRunnerConfig } = this.globalConfig;
115115
if (taskRunnerConfig.enabled) {
116-
const { TaskRunnerModule } = await import('@/runners/task-runner-module');
116+
const { TaskRunnerModule } = await import('@/task-runners/task-runner-module');
117117
const taskRunnerModule = Container.get(TaskRunnerModule);
118118
await taskRunnerModule.start();
119119
}

Diff for: ‎packages/cli/src/runners/__tests__/forward-to-logger.test.ts renamed to ‎packages/cli/src/task-runners/__tests__/forward-to-logger.test.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/__tests__/node-process-oom-detector.test.ts renamed to ‎packages/cli/src/task-runners/__tests__/node-process-oom-detector.test.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/__tests__/sliding-window-signal.test.ts renamed to ‎packages/cli/src/task-runners/__tests__/sliding-window-signal.test.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/__tests__/task-broker.test.ts renamed to ‎packages/cli/src/task-runners/__tests__/task-broker.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import { Time } from '@/constants';
77

88
import { TaskRejectError } from '../errors';
99
import { TaskRunnerTimeoutError } from '../errors/task-runner-timeout.error';
10-
import type { RunnerLifecycleEvents } from '../runner-lifecycle-events';
1110
import { TaskBroker } from '../task-broker.service';
1211
import type { TaskOffer, TaskRequest, TaskRunner } from '../task-broker.service';
12+
import type { TaskRunnerLifecycleEvents } from '../task-runner-lifecycle-events';
1313

1414
const createValidUntil = (ms: number) => process.hrtime.bigint() + BigInt(ms * 1_000_000);
1515

@@ -718,7 +718,7 @@ describe('TaskBroker', () => {
718718
describe('task timeouts', () => {
719719
let taskBroker: TaskBroker;
720720
let config: TaskRunnersConfig;
721-
let runnerLifecycleEvents = mock<RunnerLifecycleEvents>();
721+
let runnerLifecycleEvents = mock<TaskRunnerLifecycleEvents>();
722722

723723
beforeAll(() => {
724724
jest.useFakeTimers();

Diff for: ‎packages/cli/src/runners/__tests__/task-runner-process-restart-loop-detector.test.ts renamed to ‎packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { TaskRunnersConfig } from '@n8n/config';
22
import { mock } from 'jest-mock-extended';
33
import type { Logger } from 'n8n-core';
44

5-
import type { TaskRunnerAuthService } from '@/runners/auth/task-runner-auth.service';
6-
import { TaskRunnerRestartLoopError } from '@/runners/errors/task-runner-restart-loop-error';
7-
import { RunnerLifecycleEvents } from '@/runners/runner-lifecycle-events';
8-
import { TaskRunnerProcess } from '@/runners/task-runner-process';
9-
import { TaskRunnerProcessRestartLoopDetector } from '@/runners/task-runner-process-restart-loop-detector';
5+
import type { TaskRunnerAuthService } from '@/task-runners/auth/task-runner-auth.service';
6+
import { TaskRunnerRestartLoopError } from '@/task-runners/errors/task-runner-restart-loop-error';
7+
import { TaskRunnerLifecycleEvents } from '@/task-runners/task-runner-lifecycle-events';
8+
import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
9+
import { TaskRunnerProcessRestartLoopDetector } from '@/task-runners/task-runner-process-restart-loop-detector';
1010

1111
describe('TaskRunnerProcessRestartLoopDetector', () => {
1212
const mockLogger = mock<Logger>();
@@ -16,7 +16,7 @@ describe('TaskRunnerProcessRestartLoopDetector', () => {
1616
mockLogger,
1717
runnerConfig,
1818
mockAuthService,
19-
new RunnerLifecycleEvents(),
19+
new TaskRunnerLifecycleEvents(),
2020
);
2121

2222
it('should detect a restart loop if process exits 5 times within 5s', () => {

Diff for: ‎packages/cli/src/runners/__tests__/task-runner-process.test.ts renamed to ‎packages/cli/src/task-runners/__tests__/task-runner-process.test.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { mock } from 'jest-mock-extended';
33
import { Logger } from 'n8n-core';
44
import type { ChildProcess, SpawnOptions } from 'node:child_process';
55

6-
import type { TaskRunnerAuthService } from '@/runners/auth/task-runner-auth.service';
7-
import { TaskRunnerProcess } from '@/runners/task-runner-process';
6+
import type { TaskRunnerAuthService } from '@/task-runners/auth/task-runner-auth.service';
7+
import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
88
import { mockInstance } from '@test/mocking';
99

10-
import type { RunnerLifecycleEvents } from '../runner-lifecycle-events';
10+
import type { TaskRunnerLifecycleEvents } from '../task-runner-lifecycle-events';
1111

1212
const spawnMock = jest.fn(() =>
1313
mock<ChildProcess>({
@@ -43,7 +43,7 @@ describe('TaskRunnerProcess', () => {
4343
});
4444

4545
it('should register listener for `runner:failed-heartbeat-check` event', () => {
46-
const runnerLifecycleEvents = mock<RunnerLifecycleEvents>();
46+
const runnerLifecycleEvents = mock<TaskRunnerLifecycleEvents>();
4747
new TaskRunnerProcess(logger, runnerConfig, authService, runnerLifecycleEvents);
4848

4949
expect(runnerLifecycleEvents.on).toHaveBeenCalledWith(
@@ -53,7 +53,7 @@ describe('TaskRunnerProcess', () => {
5353
});
5454

5555
it('should register listener for `runner:timed-out-during-task` event', () => {
56-
const runnerLifecycleEvents = mock<RunnerLifecycleEvents>();
56+
const runnerLifecycleEvents = mock<TaskRunnerLifecycleEvents>();
5757
new TaskRunnerProcess(logger, runnerConfig, authService, runnerLifecycleEvents);
5858

5959
expect(runnerLifecycleEvents.on).toHaveBeenCalledWith(

Diff for: ‎packages/cli/src/runners/__tests__/task-runner-server.test.ts renamed to ‎packages/cli/src/task-runners/__tests__/task-runner-server.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { mock } from 'jest-mock-extended';
33
import { ServerResponse } from 'node:http';
44
import type WebSocket from 'ws';
55

6-
import type { TaskRunnerAuthController } from '@/runners/auth/task-runner-auth.controller';
7-
import { TaskRunnerServer } from '@/runners/task-runner-server';
6+
import type { TaskRunnerAuthController } from '@/task-runners/auth/task-runner-auth.controller';
7+
import { TaskRunnerServer } from '@/task-runners/task-runner-server';
88

9-
import type { TaskRunnerServerInitRequest } from '../runner-types';
9+
import type { TaskRunnerServerInitRequest } from '../task-runner-types';
1010

1111
describe('TaskRunnerServer', () => {
1212
describe('handleUpgradeRequest', () => {

Diff for: ‎packages/cli/src/runners/__tests__/task-runner-ws-server.test.ts renamed to ‎packages/cli/src/task-runners/__tests__/task-runner-ws-server.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { mock } from 'jest-mock-extended';
33
import type WebSocket from 'ws';
44

55
import { Time, WsStatusCodes } from '@/constants';
6-
import { TaskRunnerWsServer } from '@/runners/runner-ws-server';
6+
import { TaskRunnerWsServer } from '@/task-runners/task-runner-ws-server';
77

88
describe('TaskRunnerWsServer', () => {
99
describe('removeConnection', () => {

Diff for: ‎packages/cli/src/runners/auth/__tests__/task-runner-auth.controller.test.ts renamed to ‎packages/cli/src/task-runners/auth/__tests__/task-runner-auth.controller.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { mockInstance } from '@test/mocking';
88
import { BadRequestError } from '../../../errors/response-errors/bad-request.error';
99
import { ForbiddenError } from '../../../errors/response-errors/forbidden.error';
1010
import type { AuthlessRequest } from '../../../requests';
11-
import type { TaskRunnerServerInitRequest } from '../../runner-types';
11+
import type { TaskRunnerServerInitRequest } from '../../task-runner-types';
1212
import { TaskRunnerAuthController } from '../task-runner-auth.controller';
1313
import { TaskRunnerAuthService } from '../task-runner-auth.service';
1414

Diff for: ‎packages/cli/src/runners/auth/__tests__/task-runner-auth.service.test.ts renamed to ‎packages/cli/src/task-runners/auth/__tests__/task-runner-auth.service.test.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/auth/task-runner-auth.controller.ts renamed to ‎packages/cli/src/task-runners/auth/task-runner-auth.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { taskRunnerAuthRequestBodySchema } from './task-runner-auth.schema';
77
import { TaskRunnerAuthService } from './task-runner-auth.service';
88
import { BadRequestError } from '../../errors/response-errors/bad-request.error';
99
import { ForbiddenError } from '../../errors/response-errors/forbidden.error';
10-
import type { TaskRunnerServerInitRequest } from '../runner-types';
10+
import type { TaskRunnerServerInitRequest } from '../task-runner-types';
1111

1212
/**
1313
* Controller responsible for authenticating Task Runner connections

Diff for: ‎packages/cli/src/runners/auth/task-runner-auth.schema.ts renamed to ‎packages/cli/src/task-runners/auth/task-runner-auth.schema.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/auth/task-runner-auth.service.ts renamed to ‎packages/cli/src/task-runners/auth/task-runner-auth.service.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/default-task-runner-disconnect-analyzer.ts renamed to ‎packages/cli/src/task-runners/default-task-runner-disconnect-analyzer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import config from '@/config';
44

55
import { TaskRunnerDisconnectedError } from './errors/task-runner-disconnected-error';
66
import { TaskRunnerFailedHeartbeatError } from './errors/task-runner-failed-heartbeat.error';
7-
import type { DisconnectAnalyzer, DisconnectErrorOptions } from './runner-types';
7+
import type { DisconnectAnalyzer, DisconnectErrorOptions } from './task-runner-types';
88

99
/**
1010
* Analyzes the disconnect reason of a task runner to provide a more

Diff for: ‎packages/cli/src/runners/errors.ts renamed to ‎packages/cli/src/task-runners/errors.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/errors/__tests__/task-runner-disconnected-error.test.ts renamed to ‎packages/cli/src/task-runners/errors/__tests__/task-runner-disconnected-error.test.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/errors/missing-auth-token.error.ts renamed to ‎packages/cli/src/task-runners/errors/missing-auth-token.error.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/errors/task-runner-disconnected-error.ts renamed to ‎packages/cli/src/task-runners/errors/task-runner-disconnected-error.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/errors/task-runner-failed-heartbeat.error.ts renamed to ‎packages/cli/src/task-runners/errors/task-runner-failed-heartbeat.error.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/errors/task-runner-oom-error.ts renamed to ‎packages/cli/src/task-runners/errors/task-runner-oom-error.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/errors/task-runner-restart-loop-error.ts renamed to ‎packages/cli/src/task-runners/errors/task-runner-restart-loop-error.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/errors/task-runner-timeout.error.ts renamed to ‎packages/cli/src/task-runners/errors/task-runner-timeout.error.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/forward-to-logger.ts renamed to ‎packages/cli/src/task-runners/forward-to-logger.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/internal-task-runner-disconnect-analyzer.ts renamed to ‎packages/cli/src/task-runners/internal-task-runner-disconnect-analyzer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { Service } from 'typedi';
33

44
import { DefaultTaskRunnerDisconnectAnalyzer } from './default-task-runner-disconnect-analyzer';
55
import { TaskRunnerOomError } from './errors/task-runner-oom-error';
6-
import type { DisconnectErrorOptions } from './runner-types';
76
import { SlidingWindowSignal } from './sliding-window-signal';
87
import type { ExitReason, TaskRunnerProcessEventMap } from './task-runner-process';
98
import { TaskRunnerProcess } from './task-runner-process';
9+
import type { DisconnectErrorOptions } from './task-runner-types';
1010

1111
/**
1212
* Analyzes the disconnect reason of a task runner process to provide a more

Diff for: ‎packages/cli/src/runners/node-process-oom-detector.ts renamed to ‎packages/cli/src/task-runners/node-process-oom-detector.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/sliding-window-signal.ts renamed to ‎packages/cli/src/task-runners/sliding-window-signal.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/task-broker.service.ts renamed to ‎packages/cli/src/task-runners/task-broker.service.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { Time } from '@/constants';
1515

1616
import { TaskDeferredError, TaskRejectError } from './errors';
1717
import { TaskRunnerTimeoutError } from './errors/task-runner-timeout.error';
18-
import { RunnerLifecycleEvents } from './runner-lifecycle-events';
18+
import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
1919

2020
export interface TaskRunner {
2121
id: string;
@@ -89,7 +89,7 @@ export class TaskBroker {
8989
constructor(
9090
private readonly logger: Logger,
9191
private readonly taskRunnersConfig: TaskRunnersConfig,
92-
private readonly runnerLifecycleEvents: RunnerLifecycleEvents,
92+
private readonly taskRunnerLifecycleEvents: TaskRunnerLifecycleEvents,
9393
) {
9494
if (this.taskRunnersConfig.taskTimeout <= 0) {
9595
throw new ApplicationError('Task timeout must be greater than 0');
@@ -460,7 +460,7 @@ export class TaskBroker {
460460
if (!task) return;
461461

462462
if (this.taskRunnersConfig.mode === 'internal') {
463-
this.runnerLifecycleEvents.emit('runner:timed-out-during-task');
463+
this.taskRunnerLifecycleEvents.emit('runner:timed-out-during-task');
464464
} else if (this.taskRunnersConfig.mode === 'external') {
465465
await this.messageRunner(task.runnerId, {
466466
type: 'broker:taskcancel',

Diff for: ‎packages/cli/src/runners/task-managers/__tests__/data-request-response-builder.test.ts renamed to ‎packages/cli/src/task-runners/task-managers/__tests__/data-request-response-builder.test.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/task-managers/__tests__/data-request-response-stripper.test.ts renamed to ‎packages/cli/src/task-runners/task-managers/__tests__/data-request-response-stripper.test.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/task-managers/__tests__/task-manager.test.ts renamed to ‎packages/cli/src/task-runners/task-managers/__tests__/task-manager.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ import { mock } from 'jest-mock-extended';
22
import { get, set } from 'lodash';
33

44
import type { NodeTypes } from '@/node-types';
5-
import type { Task } from '@/runners/task-managers/task-manager';
6-
import { TaskManager } from '@/runners/task-managers/task-manager';
5+
import type { Task } from '@/task-runners/task-managers/task-requester';
6+
import { TaskRequester } from '@/task-runners/task-managers/task-requester';
77

8-
class TestTaskManager extends TaskManager {
8+
class TestTaskRequester extends TaskRequester {
99
sentMessages: unknown[] = [];
1010

1111
sendMessage(message: unknown) {
1212
this.sentMessages.push(message);
1313
}
1414
}
1515

16-
describe('TaskManager', () => {
17-
let instance: TestTaskManager;
16+
describe('TaskRequester', () => {
17+
let instance: TestTaskRequester;
1818
const mockNodeTypes = mock<NodeTypes>();
1919

2020
beforeEach(() => {
21-
instance = new TestTaskManager(mockNodeTypes);
21+
instance = new TestTaskRequester(mockNodeTypes);
2222
});
2323

2424
describe('handleRpc', () => {

Diff for: ‎packages/cli/src/runners/task-managers/data-request-response-builder.ts renamed to ‎packages/cli/src/task-runners/task-managers/data-request-response-builder.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/task-managers/data-request-response-stripper.ts renamed to ‎packages/cli/src/task-runners/task-managers/data-request-response-stripper.ts

File renamed without changes.

Diff for: ‎packages/cli/src/runners/task-managers/local-task-manager.ts renamed to ‎packages/cli/src/task-runners/task-managers/local-task-requester.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import Container, { Service } from 'typedi';
33

44
import { NodeTypes } from '@/node-types';
55

6-
import { TaskManager } from './task-manager';
6+
import { TaskRequester } from './task-requester';
77
import type { RequesterMessageCallback } from '../task-broker.service';
88
import { TaskBroker } from '../task-broker.service';
99

1010
@Service()
11-
export class LocalTaskManager extends TaskManager {
11+
export class LocalTaskRequester extends TaskRequester {
1212
taskBroker: TaskBroker;
1313

14-
id: string = 'single-main';
14+
id = 'local-task-requester';
1515

1616
constructor(nodeTypes: NodeTypes) {
1717
super(nodeTypes);

Diff for: ‎packages/cli/src/runners/task-managers/task-manager.ts renamed to ‎packages/cli/src/task-runners/task-managers/task-requester.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ interface ExecuteFunctionObject {
4949
}
5050

5151
@Service()
52-
export abstract class TaskManager {
52+
export abstract class TaskRequester {
5353
requestAcceptRejects: Map<string, { accept: RequestAccept; reject: RequestReject }> = new Map();
5454

5555
taskAcceptRejects: Map<string, { accept: TaskAccept; reject: TaskReject }> = new Map();

Diff for: ‎packages/cli/src/runners/runner-lifecycle-events.ts renamed to ‎packages/cli/src/task-runners/task-runner-lifecycle-events.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { Service } from 'typedi';
22

33
import { TypedEmitter } from '@/typed-emitter';
44

5-
type RunnerLifecycleEventMap = {
5+
type TaskRunnerLifecycleEventMap = {
66
'runner:failed-heartbeat-check': never;
77
'runner:timed-out-during-task': never;
88
};
99

1010
@Service()
11-
export class RunnerLifecycleEvents extends TypedEmitter<RunnerLifecycleEventMap> {}
11+
export class TaskRunnerLifecycleEvents extends TypedEmitter<TaskRunnerLifecycleEventMap> {}

Diff for: ‎packages/cli/src/runners/task-runner-module.ts renamed to ‎packages/cli/src/task-runners/task-runner-module.ts

+17-15
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import * as a from 'node:assert/strict';
55
import Container, { Service } from 'typedi';
66

77
import { OnShutdown } from '@/decorators/on-shutdown';
8-
import type { TaskRunnerRestartLoopError } from '@/runners/errors/task-runner-restart-loop-error';
9-
import type { TaskRunnerProcess } from '@/runners/task-runner-process';
10-
import { TaskRunnerProcessRestartLoopDetector } from '@/runners/task-runner-process-restart-loop-detector';
8+
import type { TaskRunnerRestartLoopError } from '@/task-runners/errors/task-runner-restart-loop-error';
9+
import type { TaskRunnerProcess } from '@/task-runners/task-runner-process';
10+
import { TaskRunnerProcessRestartLoopDetector } from '@/task-runners/task-runner-process-restart-loop-detector';
1111

1212
import { MissingAuthTokenError } from './errors/missing-auth-token.error';
13-
import { TaskRunnerWsServer } from './runner-ws-server';
14-
import type { LocalTaskManager } from './task-managers/local-task-manager';
13+
import type { LocalTaskRequester } from './task-managers/local-task-requester';
1514
import type { TaskRunnerServer } from './task-runner-server';
15+
import { TaskRunnerWsServer } from './task-runner-ws-server';
1616

1717
/**
1818
* Module responsible for loading and starting task runner. Task runner can be
@@ -25,7 +25,7 @@ export class TaskRunnerModule {
2525

2626
private taskRunnerWsServer: TaskRunnerWsServer | undefined;
2727

28-
private taskManager: LocalTaskManager | undefined;
28+
private taskRequester: LocalTaskRequester | undefined;
2929

3030
private taskRunnerProcess: TaskRunnerProcess | undefined;
3131

@@ -46,7 +46,7 @@ export class TaskRunnerModule {
4646

4747
if (mode === 'external' && !authToken) throw new MissingAuthTokenError();
4848

49-
await this.loadTaskManager();
49+
await this.loadTaskRequester();
5050
await this.loadTaskRunnerServer();
5151

5252
if (mode === 'internal') {
@@ -73,17 +73,19 @@ export class TaskRunnerModule {
7373
await Promise.all([stopRunnerProcessTask, stopRunnerServerTask]);
7474
}
7575

76-
private async loadTaskManager() {
77-
const { TaskManager } = await import('@/runners/task-managers/task-manager');
78-
const { LocalTaskManager } = await import('@/runners/task-managers/local-task-manager');
79-
this.taskManager = Container.get(LocalTaskManager);
80-
Container.set(TaskManager, this.taskManager);
76+
private async loadTaskRequester() {
77+
const { TaskRequester } = await import('@/task-runners/task-managers/task-requester');
78+
const { LocalTaskRequester } = await import(
79+
'@/task-runners/task-managers/local-task-requester'
80+
);
81+
this.taskRequester = Container.get(LocalTaskRequester);
82+
Container.set(TaskRequester, this.taskRequester);
8183
}
8284

8385
private async loadTaskRunnerServer() {
8486
// These are imported dynamically because we need to set the task manager
8587
// instance before importing them
86-
const { TaskRunnerServer } = await import('@/runners/task-runner-server');
88+
const { TaskRunnerServer } = await import('@/task-runners/task-runner-server');
8789
this.taskRunnerHttpServer = Container.get(TaskRunnerServer);
8890
this.taskRunnerWsServer = Container.get(TaskRunnerWsServer);
8991

@@ -93,7 +95,7 @@ export class TaskRunnerModule {
9395
private async startInternalTaskRunner() {
9496
a.ok(this.taskRunnerWsServer, 'Task Runner WS Server not loaded');
9597

96-
const { TaskRunnerProcess } = await import('@/runners/task-runner-process');
98+
const { TaskRunnerProcess } = await import('@/task-runners/task-runner-process');
9799
this.taskRunnerProcess = Container.get(TaskRunnerProcess);
98100
this.taskRunnerProcessRestartLoopDetector = new TaskRunnerProcessRestartLoopDetector(
99101
this.taskRunnerProcess,
@@ -106,7 +108,7 @@ export class TaskRunnerModule {
106108
await this.taskRunnerProcess.start();
107109

108110
const { InternalTaskRunnerDisconnectAnalyzer } = await import(
109-
'@/runners/internal-task-runner-disconnect-analyzer'
111+
'@/task-runners/internal-task-runner-disconnect-analyzer'
110112
);
111113
this.taskRunnerWsServer.setDisconnectAnalyzer(
112114
Container.get(InternalTaskRunnerDisconnectAnalyzer),

Diff for: ‎packages/cli/src/runners/task-runner-process-restart-loop-detector.ts renamed to ‎packages/cli/src/task-runners/task-runner-process-restart-loop-detector.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Time } from '@/constants';
2-
import { TaskRunnerRestartLoopError } from '@/runners/errors/task-runner-restart-loop-error';
3-
import type { TaskRunnerProcess } from '@/runners/task-runner-process';
2+
import { TaskRunnerRestartLoopError } from '@/task-runners/errors/task-runner-restart-loop-error';
3+
import type { TaskRunnerProcess } from '@/task-runners/task-runner-process';
44
import { TypedEmitter } from '@/typed-emitter';
55

66
const MAX_RESTARTS = 5;

Diff for: ‎packages/cli/src/runners/task-runner-process.ts renamed to ‎packages/cli/src/task-runners/task-runner-process.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { OnShutdown } from '@/decorators/on-shutdown';
1010
import { TaskRunnerAuthService } from './auth/task-runner-auth.service';
1111
import { forwardToLogger } from './forward-to-logger';
1212
import { NodeProcessOomDetector } from './node-process-oom-detector';
13-
import { RunnerLifecycleEvents } from './runner-lifecycle-events';
13+
import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
1414
import { TypedEmitter } from '../typed-emitter';
1515

1616
type ChildProcess = ReturnType<typeof spawn>;
@@ -68,7 +68,7 @@ export class TaskRunnerProcess extends TypedEmitter<TaskRunnerProcessEventMap> {
6868
logger: Logger,
6969
private readonly runnerConfig: TaskRunnersConfig,
7070
private readonly authService: TaskRunnerAuthService,
71-
private readonly runnerLifecycleEvents: RunnerLifecycleEvents,
71+
private readonly runnerLifecycleEvents: TaskRunnerLifecycleEvents,
7272
) {
7373
super();
7474

Diff for: ‎packages/cli/src/runners/task-runner-server.ts renamed to ‎packages/cli/src/task-runners/task-runner-server.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import { Server as WSServer } from 'ws';
1313
import { inTest } from '@/constants';
1414
import { bodyParser, rawBodyReader } from '@/middlewares';
1515
import { send } from '@/response-helper';
16-
import { TaskRunnerAuthController } from '@/runners/auth/task-runner-auth.controller';
16+
import { TaskRunnerAuthController } from '@/task-runners/auth/task-runner-auth.controller';
1717
import type {
1818
TaskRunnerServerInitRequest,
1919
TaskRunnerServerInitResponse,
20-
} from '@/runners/runner-types';
21-
import { TaskRunnerWsServer } from '@/runners/runner-ws-server';
20+
} from '@/task-runners/task-runner-types';
21+
import { TaskRunnerWsServer } from '@/task-runners/task-runner-ws-server';
2222

2323
/**
2424
* Task Runner HTTP & WS server

Diff for: ‎packages/cli/src/runners/runner-types.ts renamed to ‎packages/cli/src/task-runners/task-runner-types.ts

File renamed without changes.

0 commit comments

Comments
 (0)