n8n 0.150.0 → 0.154.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/n8n +1 -1
- package/dist/commands/execute.js +2 -1
- package/dist/commands/execute.js.map +1 -1
- package/dist/commands/executeBatch.js +3 -2
- package/dist/commands/executeBatch.js.map +1 -1
- package/dist/commands/import/workflow.js.map +1 -1
- package/dist/commands/start.js +2 -9
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +2 -1
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +2 -2
- package/dist/commands/worker.js.map +1 -1
- package/dist/src/ActiveExecutions.js +2 -0
- package/dist/src/ActiveExecutions.js.map +1 -1
- package/dist/src/Interfaces.d.ts +5 -3
- package/dist/src/InternalHooks.d.ts +3 -2
- package/dist/src/InternalHooks.js +15 -5
- package/dist/src/InternalHooks.js.map +1 -1
- package/dist/src/InternalHooksManager.d.ts +1 -1
- package/dist/src/InternalHooksManager.js +2 -2
- package/dist/src/InternalHooksManager.js.map +1 -1
- package/dist/src/Server.js +12 -1
- package/dist/src/Server.js.map +1 -1
- package/dist/src/WorkflowExecuteAdditionalData.d.ts +1 -1
- package/dist/src/WorkflowExecuteAdditionalData.js +6 -6
- package/dist/src/WorkflowExecuteAdditionalData.js.map +1 -1
- package/dist/src/WorkflowRunnerProcess.js +2 -1
- package/dist/src/WorkflowRunnerProcess.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +2 -1
- package/dist/src/telemetry/index.js +34 -14
- package/dist/src/telemetry/index.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +7 -6
package/bin/n8n
CHANGED
|
@@ -26,7 +26,7 @@ var nodeVersion = process.versions.node.split('.');
|
|
|
26
26
|
|
|
27
27
|
if (parseInt(nodeVersion[0], 10) < 14) {
|
|
28
28
|
console.log(`\nYour Node.js version (${process.versions.node}) is too old to run n8n.\nPlease update to version 14 or later!\n`);
|
|
29
|
-
process.exit(
|
|
29
|
+
process.exit(1);
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
require('@oclif/command').run()
|
package/dist/commands/execute.js
CHANGED
|
@@ -60,7 +60,8 @@ class Execute extends command_1.Command {
|
|
|
60
60
|
const externalHooks = src_1.ExternalHooks();
|
|
61
61
|
await externalHooks.init();
|
|
62
62
|
const instanceId = await n8n_core_1.UserSettings.getInstanceId();
|
|
63
|
-
src_1.
|
|
63
|
+
const { cli } = await src_1.GenericHelpers.getVersions();
|
|
64
|
+
src_1.InternalHooksManager.init(instanceId, cli);
|
|
64
65
|
const nodeTypes = src_1.NodeTypes();
|
|
65
66
|
await nodeTypes.init(loadNodesAndCredentials.nodeTypes);
|
|
66
67
|
const credentialTypes = src_1.CredentialTypes();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../commands/execute.ts"],"names":[],"mappings":";;;AAEA,2BAAoC;AACpC,4CAAgD;AAChD,uCAAwC;AACxC,+CAAkD;AAElD,
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../commands/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -154,7 +154,8 @@ class ExecuteBatch extends command_1.Command {
|
|
|
154
154
|
const externalHooks = src_1.ExternalHooks();
|
|
155
155
|
await externalHooks.init();
|
|
156
156
|
const instanceId = await n8n_core_1.UserSettings.getInstanceId();
|
|
157
|
-
src_1.
|
|
157
|
+
const { cli } = await src_1.GenericHelpers.getVersions();
|
|
158
|
+
src_1.InternalHooksManager.init(instanceId, cli);
|
|
158
159
|
const nodeTypes = src_1.NodeTypes();
|
|
159
160
|
await nodeTypes.init(loadNodesAndCredentials.nodeTypes);
|
|
160
161
|
const credentialTypes = src_1.CredentialTypes();
|
|
@@ -585,7 +586,7 @@ class ExecuteBatch extends command_1.Command {
|
|
|
585
586
|
}
|
|
586
587
|
}
|
|
587
588
|
catch (e) {
|
|
588
|
-
executionResult.error =
|
|
589
|
+
executionResult.error = `Workflow failed to execute: ${e.message}`;
|
|
589
590
|
executionResult.executionStatus = 'error';
|
|
590
591
|
}
|
|
591
592
|
clearTimeout(timeoutTimer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeBatch.js","sourceRoot":"","sources":["../../commands/executeBatch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"executeBatch.js","sourceRoot":"","sources":["../../commands/executeBatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../commands/import/workflow.ts"],"names":[],"mappings":";;;AAEA,4CAAgD;AAEhD,+CAA2E;AAE3E,yBAAyB;AACzB,kCAAkC;
|
|
1
|
+
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../commands/import/workflow.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/start.js
CHANGED
|
@@ -67,14 +67,6 @@ class Start extends command_1.Command {
|
|
|
67
67
|
const logger = Logger_1.getLogger();
|
|
68
68
|
n8n_workflow_1.LoggerProxy.init(logger);
|
|
69
69
|
logger.info('Initializing n8n process');
|
|
70
|
-
logger.info('\n' +
|
|
71
|
-
'****************************************************\n' +
|
|
72
|
-
'* *\n' +
|
|
73
|
-
'* n8n now sends selected, anonymous telemetry. *\n' +
|
|
74
|
-
'* For more details (and how to opt out): *\n' +
|
|
75
|
-
'* https://docs.n8n.io/reference/telemetry.html *\n' +
|
|
76
|
-
'* *\n' +
|
|
77
|
-
'****************************************************\n');
|
|
78
70
|
const startDbInitPromise = src_1.Db.init().catch((error) => {
|
|
79
71
|
logger.error(`There was an error initializing DB: "${error.message}"`);
|
|
80
72
|
processExitCode = 1;
|
|
@@ -178,7 +170,8 @@ class Start extends command_1.Command {
|
|
|
178
170
|
this.log('IMPORTANT! Do not share with anybody as it would give people access to your n8n instance!');
|
|
179
171
|
}
|
|
180
172
|
const instanceId = await n8n_core_1.UserSettings.getInstanceId();
|
|
181
|
-
src_1.
|
|
173
|
+
const { cli } = await src_1.GenericHelpers.getVersions();
|
|
174
|
+
src_1.InternalHooksManager.init(instanceId, cli);
|
|
182
175
|
await src_1.Server.start();
|
|
183
176
|
activeWorkflowRunner = src_1.ActiveWorkflowRunner.getInstance();
|
|
184
177
|
await activeWorkflowRunner.init();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../commands/start.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../commands/start.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/webhook.js
CHANGED
|
@@ -67,7 +67,8 @@ class Webhook extends command_1.Command {
|
|
|
67
67
|
await credentialTypes.init(loadNodesAndCredentials.credentialTypes);
|
|
68
68
|
await startDbInitPromise;
|
|
69
69
|
const instanceId = await n8n_core_1.UserSettings.getInstanceId();
|
|
70
|
-
src_1.
|
|
70
|
+
const { cli } = await src_1.GenericHelpers.getVersions();
|
|
71
|
+
src_1.InternalHooksManager.init(instanceId, cli);
|
|
71
72
|
if (config.get('executions.mode') === 'queue') {
|
|
72
73
|
const redisHost = config.get('queue.bull.redis.host');
|
|
73
74
|
const redisPassword = config.get('queue.bull.redis.password');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../commands/webhook.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../commands/webhook.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/worker.js
CHANGED
|
@@ -130,9 +130,9 @@ class Worker extends command_1.Command {
|
|
|
130
130
|
const redisConnectionTimeoutLimit = config.get('queue.bull.redis.timeoutThreshold');
|
|
131
131
|
Worker.jobQueue = Queue.getInstance().getBullObjectInstance();
|
|
132
132
|
Worker.jobQueue.process(flags.concurrency, async (job) => this.runJob(job, nodeTypes));
|
|
133
|
-
const instanceId = await n8n_core_1.UserSettings.getInstanceId();
|
|
134
|
-
src_1.InternalHooksManager.init(instanceId);
|
|
135
133
|
const versions = await src_1.GenericHelpers.getVersions();
|
|
134
|
+
const instanceId = await n8n_core_1.UserSettings.getInstanceId();
|
|
135
|
+
src_1.InternalHooksManager.init(instanceId, versions.cli);
|
|
136
136
|
console.info('\nn8n worker is now ready');
|
|
137
137
|
console.info(` * Version: ${versions.cli}`);
|
|
138
138
|
console.info(` * Concurrency: ${flags.concurrency}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../commands/worker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../commands/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getInstance = exports.ActiveExecutions = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
const flatted_1 = require("flatted");
|
|
5
6
|
const _1 = require(".");
|
|
6
7
|
class ActiveExecutions {
|
|
7
8
|
constructor() {
|
|
@@ -34,6 +35,7 @@ class ActiveExecutions {
|
|
|
34
35
|
else {
|
|
35
36
|
const execution = {
|
|
36
37
|
id: executionId,
|
|
38
|
+
data: flatted_1.stringify(executionData.executionData),
|
|
37
39
|
waitTill: null,
|
|
38
40
|
};
|
|
39
41
|
await _1.Db.collections.Execution.update(executionId, execution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActiveExecutions.js","sourceRoot":"","sources":["../../src/ActiveExecutions.ts"],"names":[],"mappings":";;;AAOA,+CAKsB;
|
|
1
|
+
{"version":3,"file":"ActiveExecutions.js","sourceRoot":"","sources":["../../src/ActiveExecutions.ts"],"names":[],"mappings":"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"}
|
package/dist/src/Interfaces.d.ts
CHANGED
|
@@ -239,7 +239,7 @@ export interface IDiagnosticInfo {
|
|
|
239
239
|
}
|
|
240
240
|
export interface IInternalHooksClass {
|
|
241
241
|
onN8nStop(): Promise<void>;
|
|
242
|
-
onServerStarted(diagnosticInfo: IDiagnosticInfo): Promise<unknown[]>;
|
|
242
|
+
onServerStarted(diagnosticInfo: IDiagnosticInfo, firstWorkflowCreatedAt?: Date): Promise<unknown[]>;
|
|
243
243
|
onPersonalizationSurveySubmitted(answers: IPersonalizationSurveyAnswers): Promise<void>;
|
|
244
244
|
onWorkflowCreated(workflow: IWorkflowBase): Promise<void>;
|
|
245
245
|
onWorkflowDeleted(workflowId: string): Promise<void>;
|
|
@@ -316,10 +316,12 @@ export interface IN8nUISettings {
|
|
|
316
316
|
personalizationSurvey: IPersonalizationSurvey;
|
|
317
317
|
}
|
|
318
318
|
export interface IPersonalizationSurveyAnswers {
|
|
319
|
-
companySize: string | null;
|
|
320
319
|
codingSkill: string | null;
|
|
321
|
-
|
|
320
|
+
companyIndustry: string[];
|
|
321
|
+
companySize: string | null;
|
|
322
|
+
otherCompanyIndustry: string | null;
|
|
322
323
|
otherWorkArea: string | null;
|
|
324
|
+
workArea: string[] | string | null;
|
|
323
325
|
}
|
|
324
326
|
export interface IPersonalizationSurvey {
|
|
325
327
|
answers?: IPersonalizationSurveyAnswers;
|
|
@@ -3,8 +3,9 @@ import { IDiagnosticInfo, IInternalHooksClass, IPersonalizationSurveyAnswers, IW
|
|
|
3
3
|
import { Telemetry } from './telemetry';
|
|
4
4
|
export declare class InternalHooksClass implements IInternalHooksClass {
|
|
5
5
|
private telemetry;
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
private versionCli;
|
|
7
|
+
constructor(telemetry: Telemetry, versionCli: string);
|
|
8
|
+
onServerStarted(diagnosticInfo: IDiagnosticInfo, earliestWorkflowCreatedAt?: Date): Promise<unknown[]>;
|
|
8
9
|
onPersonalizationSurveySubmitted(answers: IPersonalizationSurveyAnswers): Promise<void>;
|
|
9
10
|
onWorkflowCreated(workflow: IWorkflowBase): Promise<void>;
|
|
10
11
|
onWorkflowDeleted(workflowId: string): Promise<void>;
|
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.InternalHooksClass = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
class InternalHooksClass {
|
|
6
|
-
constructor(telemetry) {
|
|
6
|
+
constructor(telemetry, versionCli) {
|
|
7
7
|
this.telemetry = telemetry;
|
|
8
|
+
this.versionCli = versionCli;
|
|
8
9
|
}
|
|
9
|
-
async onServerStarted(diagnosticInfo) {
|
|
10
|
+
async onServerStarted(diagnosticInfo, earliestWorkflowCreatedAt) {
|
|
10
11
|
const info = {
|
|
11
12
|
version_cli: diagnosticInfo.versionCli,
|
|
12
13
|
db_type: diagnosticInfo.databaseType,
|
|
@@ -19,7 +20,7 @@ class InternalHooksClass {
|
|
|
19
20
|
};
|
|
20
21
|
return Promise.all([
|
|
21
22
|
this.telemetry.identify(info),
|
|
22
|
-
this.telemetry.track('Instance started', info),
|
|
23
|
+
this.telemetry.track('Instance started', Object.assign(Object.assign({}, info), { earliest_workflow_created: earliestWorkflowCreatedAt })),
|
|
23
24
|
]);
|
|
24
25
|
}
|
|
25
26
|
async onPersonalizationSurveySubmitted(answers) {
|
|
@@ -28,12 +29,16 @@ class InternalHooksClass {
|
|
|
28
29
|
coding_skill: answers.codingSkill,
|
|
29
30
|
work_area: answers.workArea,
|
|
30
31
|
other_work_area: answers.otherWorkArea,
|
|
32
|
+
company_industry: answers.companyIndustry,
|
|
33
|
+
other_company_industry: answers.otherCompanyIndustry,
|
|
31
34
|
});
|
|
32
35
|
}
|
|
33
36
|
async onWorkflowCreated(workflow) {
|
|
37
|
+
const { nodeGraph } = n8n_workflow_1.TelemetryHelpers.generateNodesGraph(workflow);
|
|
34
38
|
return this.telemetry.track('User created workflow', {
|
|
35
39
|
workflow_id: workflow.id,
|
|
36
|
-
node_graph:
|
|
40
|
+
node_graph: nodeGraph,
|
|
41
|
+
node_graph_string: JSON.stringify(nodeGraph),
|
|
37
42
|
});
|
|
38
43
|
}
|
|
39
44
|
async onWorkflowDeleted(workflowId) {
|
|
@@ -42,9 +47,12 @@ class InternalHooksClass {
|
|
|
42
47
|
});
|
|
43
48
|
}
|
|
44
49
|
async onWorkflowSaved(workflow) {
|
|
50
|
+
const { nodeGraph } = n8n_workflow_1.TelemetryHelpers.generateNodesGraph(workflow);
|
|
45
51
|
return this.telemetry.track('User saved workflow', {
|
|
46
52
|
workflow_id: workflow.id,
|
|
47
|
-
node_graph:
|
|
53
|
+
node_graph: nodeGraph,
|
|
54
|
+
node_graph_string: JSON.stringify(nodeGraph),
|
|
55
|
+
version_cli: this.versionCli,
|
|
48
56
|
});
|
|
49
57
|
}
|
|
50
58
|
async onWorkflowPostExecute(workflow, runData) {
|
|
@@ -52,6 +60,7 @@ class InternalHooksClass {
|
|
|
52
60
|
const properties = {
|
|
53
61
|
workflow_id: workflow.id,
|
|
54
62
|
is_manual: false,
|
|
63
|
+
version_cli: this.versionCli,
|
|
55
64
|
};
|
|
56
65
|
if (runData !== undefined) {
|
|
57
66
|
properties.execution_mode = runData.mode;
|
|
@@ -73,6 +82,7 @@ class InternalHooksClass {
|
|
|
73
82
|
if (properties.is_manual) {
|
|
74
83
|
const nodeGraphResult = n8n_workflow_1.TelemetryHelpers.generateNodesGraph(workflow);
|
|
75
84
|
properties.node_graph = nodeGraphResult.nodeGraph;
|
|
85
|
+
properties.node_graph_string = JSON.stringify(nodeGraphResult.nodeGraph);
|
|
76
86
|
if (errorNodeName) {
|
|
77
87
|
properties.error_node_id = nodeGraphResult.nameIndices[errorNodeName];
|
|
78
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalHooks.js","sourceRoot":"","sources":["../../src/InternalHooks.ts"],"names":[],"mappings":";;;AACA,+CAAmE;AASnE,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"InternalHooks.js","sourceRoot":"","sources":["../../src/InternalHooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@ import { InternalHooksClass } from './InternalHooks';
|
|
|
2
2
|
export declare class InternalHooksManager {
|
|
3
3
|
private static internalHooksInstance;
|
|
4
4
|
static getInstance(): InternalHooksClass;
|
|
5
|
-
static init(instanceId: string): InternalHooksClass;
|
|
5
|
+
static init(instanceId: string, versionCli: string): InternalHooksClass;
|
|
6
6
|
}
|
|
@@ -10,9 +10,9 @@ class InternalHooksManager {
|
|
|
10
10
|
}
|
|
11
11
|
throw new Error('InternalHooks not initialized');
|
|
12
12
|
}
|
|
13
|
-
static init(instanceId) {
|
|
13
|
+
static init(instanceId, versionCli) {
|
|
14
14
|
if (!this.internalHooksInstance) {
|
|
15
|
-
this.internalHooksInstance = new InternalHooks_1.InternalHooksClass(new telemetry_1.Telemetry(instanceId));
|
|
15
|
+
this.internalHooksInstance = new InternalHooks_1.InternalHooksClass(new telemetry_1.Telemetry(instanceId, versionCli), versionCli);
|
|
16
16
|
}
|
|
17
17
|
return this.internalHooksInstance;
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalHooksManager.js","sourceRoot":"","sources":["../../src/InternalHooksManager.ts"],"names":[],"mappings":";;;AACA,mDAAqD;AACrD,2CAAwC;AAExC,MAAa,oBAAoB;IAGhC,MAAM,CAAC,WAAW;QACjB,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC/B,OAAO,IAAI,CAAC,qBAAqB,CAAC;SAClC;QAED,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,UAAkB;
|
|
1
|
+
{"version":3,"file":"InternalHooksManager.js","sourceRoot":"","sources":["../../src/InternalHooksManager.ts"],"names":[],"mappings":";;;AACA,mDAAqD;AACrD,2CAAwC;AAExC,MAAa,oBAAoB;IAGhC,MAAM,CAAC,WAAW;QACjB,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC/B,OAAO,IAAI,CAAC,qBAAqB,CAAC;SAClC;QAED,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,UAAkB,EAAE,UAAkB;QACjD,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAChC,IAAI,CAAC,qBAAqB,GAAG,IAAI,kCAAkB,CAClD,IAAI,qBAAS,CAAC,UAAU,EAAE,UAAU,CAAC,EACrC,UAAU,CACV,CAAC;SACF;QAED,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;CACD;AArBD,oDAqBC"}
|
package/dist/src/Server.js
CHANGED
|
@@ -1594,7 +1594,18 @@ async function start() {
|
|
|
1594
1594
|
},
|
|
1595
1595
|
deploymentType: config.get('deployment.type'),
|
|
1596
1596
|
};
|
|
1597
|
-
void
|
|
1597
|
+
void _1.Db.collections
|
|
1598
|
+
.Workflow.findOne({
|
|
1599
|
+
select: ['createdAt'],
|
|
1600
|
+
order: { createdAt: 'ASC' },
|
|
1601
|
+
})
|
|
1602
|
+
.then(async (workflow) => InternalHooksManager_1.InternalHooksManager.getInstance().onServerStarted(diagnosticInfo, workflow === null || workflow === void 0 ? void 0 : workflow.createdAt));
|
|
1603
|
+
});
|
|
1604
|
+
server.on('error', (error) => {
|
|
1605
|
+
if (error.code === 'EADDRINUSE') {
|
|
1606
|
+
console.log(`n8n's port ${PORT} is already in use. Do you have another instance of n8n running already?`);
|
|
1607
|
+
process.exit(1);
|
|
1608
|
+
}
|
|
1598
1609
|
});
|
|
1599
1610
|
}
|
|
1600
1611
|
exports.start = start;
|