n8n 0.210.2 → 0.211.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/dist/Db.d.ts +2 -1
- package/dist/Db.js +40 -46
- package/dist/Db.js.map +1 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js +5 -11
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/db/revert.js +9 -32
- package/dist/commands/db/revert.js.map +1 -1
- package/dist/commands/start.js +19 -18
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +19 -18
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.d.ts +0 -1
- package/dist/commands/worker.js +23 -15
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.d.ts +0 -1
- package/dist/config/schema.d.ts +0 -6
- package/dist/config/schema.js +0 -6
- package/dist/config/schema.js.map +1 -1
- package/dist/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.d.ts +6 -0
- package/dist/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.js +37 -0
- package/dist/databases/migrations/mysqldb/1673268682475-DeleteExecutionsWithWorkflows.js.map +1 -0
- package/dist/databases/migrations/mysqldb/index.js +2 -0
- package/dist/databases/migrations/mysqldb/index.js.map +1 -1
- package/dist/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.d.ts +6 -0
- package/dist/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.js +41 -0
- package/dist/databases/migrations/postgresdb/1673268682475-DeleteExecutionsWithWorkflows.js.map +1 -0
- package/dist/databases/migrations/postgresdb/index.js +2 -0
- package/dist/databases/migrations/postgresdb/index.js.map +1 -1
- package/dist/databases/migrations/sqlite/1621707690587-AddWaitColumn.js +0 -2
- package/dist/databases/migrations/sqlite/1621707690587-AddWaitColumn.js.map +1 -1
- package/dist/databases/migrations/sqlite/1652367743993-AddUserSettings.js +0 -2
- package/dist/databases/migrations/sqlite/1652367743993-AddUserSettings.js.map +1 -1
- package/dist/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.js +0 -2
- package/dist/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.js.map +1 -1
- package/dist/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.d.ts +6 -0
- package/dist/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.js +74 -0
- package/dist/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.js.map +1 -0
- package/dist/databases/migrations/sqlite/index.js +2 -0
- package/dist/databases/migrations/sqlite/index.js.map +1 -1
- package/dist/eventbus/EventMessageClasses/AbstractEventMessage.js.map +1 -1
- package/dist/eventbus/EventMessageClasses/EventMessageAudit.js.map +1 -1
- package/dist/eventbus/EventMessageClasses/Helpers.js +6 -0
- package/dist/eventbus/EventMessageClasses/Helpers.js.map +1 -1
- package/dist/eventbus/MessageEventBus/MessageEventBus.d.ts +11 -3
- package/dist/eventbus/MessageEventBus/MessageEventBus.js +56 -30
- package/dist/eventbus/MessageEventBus/MessageEventBus.js.map +1 -1
- package/dist/eventbus/MessageEventBusDestination/Helpers.ee.js.map +1 -1
- package/dist/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.js.map +1 -1
- package/dist/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.js +1 -1
- package/dist/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.js.map +1 -1
- package/dist/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.js +1 -1
- package/dist/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.js.map +1 -1
- package/dist/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.js +2 -2
- package/dist/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.js.map +1 -1
- package/dist/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.d.ts +32 -19
- package/dist/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.js +134 -50
- package/dist/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.js.map +1 -1
- package/dist/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.d.ts +0 -10
- package/dist/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.js +47 -61
- package/dist/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.js.map +1 -1
- package/dist/eventbus/eventBusRoutes.js +47 -11
- package/dist/eventbus/eventBusRoutes.js.map +1 -1
- package/dist/workflows/workflows.controller.js +2 -18
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/dist/workflows/workflows.services.d.ts +1 -0
- package/dist/workflows/workflows.services.js +22 -0
- package/dist/workflows/workflows.services.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +6 -7
package/dist/Db.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Connection, ConnectionOptions, EntityManager, EntityTarget, ObjectLiteral, Repository } from 'typeorm';
|
|
2
|
-
import { IDatabaseCollections } from './Interfaces';
|
|
2
|
+
import { DatabaseType, IDatabaseCollections } from './Interfaces';
|
|
3
3
|
export declare let isInitialized: boolean;
|
|
4
4
|
export declare const collections: IDatabaseCollections;
|
|
5
5
|
export declare let connection: Connection;
|
|
6
6
|
export declare function transaction<T>(fn: (entityManager: EntityManager) => Promise<T>): Promise<T>;
|
|
7
7
|
export declare function linkRepository<Entity extends ObjectLiteral>(entityClass: EntityTarget<Entity>): Repository<Entity>;
|
|
8
|
+
export declare function getConnectionOptions(dbType: DatabaseType): Promise<ConnectionOptions>;
|
|
8
9
|
export declare function init(testConnectionOptions?: ConnectionOptions): Promise<IDatabaseCollections>;
|
package/dist/Db.js
CHANGED
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.init = exports.linkRepository = exports.transaction = exports.connection = exports.collections = exports.isInitialized = void 0;
|
|
29
|
+
exports.init = exports.getConnectionOptions = exports.linkRepository = exports.transaction = exports.connection = exports.collections = exports.isInitialized = void 0;
|
|
30
30
|
const typeorm_1 = require("typeorm");
|
|
31
31
|
const GenericHelpers = __importStar(require("./GenericHelpers"));
|
|
32
32
|
const config_1 = __importDefault(require("./config"));
|
|
@@ -42,52 +42,46 @@ function linkRepository(entityClass) {
|
|
|
42
42
|
return (0, typeorm_1.getRepository)(entityClass, exports.connection.name);
|
|
43
43
|
}
|
|
44
44
|
exports.linkRepository = linkRepository;
|
|
45
|
+
async function getConnectionOptions(dbType) {
|
|
46
|
+
switch (dbType) {
|
|
47
|
+
case 'postgresdb':
|
|
48
|
+
const sslCa = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.ca'));
|
|
49
|
+
const sslCert = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.cert'));
|
|
50
|
+
const sslKey = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.key'));
|
|
51
|
+
const sslRejectUnauthorized = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.rejectUnauthorized'));
|
|
52
|
+
let ssl;
|
|
53
|
+
if (sslCa !== '' || sslCert !== '' || sslKey !== '' || !sslRejectUnauthorized) {
|
|
54
|
+
ssl = {
|
|
55
|
+
ca: sslCa || undefined,
|
|
56
|
+
cert: sslCert || undefined,
|
|
57
|
+
key: sslKey || undefined,
|
|
58
|
+
rejectUnauthorized: sslRejectUnauthorized,
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
return {
|
|
62
|
+
...(0, config_2.getPostgresConnectionOptions)(),
|
|
63
|
+
...(await (0, config_2.getOptionOverrides)('postgresdb')),
|
|
64
|
+
ssl,
|
|
65
|
+
};
|
|
66
|
+
case 'mariadb':
|
|
67
|
+
case 'mysqldb':
|
|
68
|
+
return {
|
|
69
|
+
...(dbType === 'mysqldb' ? (0, config_2.getMysqlConnectionOptions)() : (0, config_2.getMariaDBConnectionOptions)()),
|
|
70
|
+
...(await (0, config_2.getOptionOverrides)('mysqldb')),
|
|
71
|
+
timezone: 'Z',
|
|
72
|
+
};
|
|
73
|
+
case 'sqlite':
|
|
74
|
+
return (0, config_2.getSqliteConnectionOptions)();
|
|
75
|
+
default:
|
|
76
|
+
throw new Error(`The database "${dbType}" is currently not supported!`);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
exports.getConnectionOptions = getConnectionOptions;
|
|
45
80
|
async function init(testConnectionOptions) {
|
|
46
81
|
if (exports.isInitialized)
|
|
47
82
|
return exports.collections;
|
|
48
83
|
const dbType = (await GenericHelpers.getConfigValue('database.type'));
|
|
49
|
-
|
|
50
|
-
const entityPrefix = config_1.default.getEnv('database.tablePrefix');
|
|
51
|
-
if (testConnectionOptions) {
|
|
52
|
-
connectionOptions = testConnectionOptions;
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
switch (dbType) {
|
|
56
|
-
case 'postgresdb':
|
|
57
|
-
const sslCa = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.ca'));
|
|
58
|
-
const sslCert = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.cert'));
|
|
59
|
-
const sslKey = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.key'));
|
|
60
|
-
const sslRejectUnauthorized = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.rejectUnauthorized'));
|
|
61
|
-
let ssl;
|
|
62
|
-
if (sslCa !== '' || sslCert !== '' || sslKey !== '' || !sslRejectUnauthorized) {
|
|
63
|
-
ssl = {
|
|
64
|
-
ca: sslCa || undefined,
|
|
65
|
-
cert: sslCert || undefined,
|
|
66
|
-
key: sslKey || undefined,
|
|
67
|
-
rejectUnauthorized: sslRejectUnauthorized,
|
|
68
|
-
};
|
|
69
|
-
}
|
|
70
|
-
connectionOptions = {
|
|
71
|
-
...(0, config_2.getPostgresConnectionOptions)(),
|
|
72
|
-
...(await (0, config_2.getOptionOverrides)('postgresdb')),
|
|
73
|
-
ssl,
|
|
74
|
-
};
|
|
75
|
-
break;
|
|
76
|
-
case 'mariadb':
|
|
77
|
-
case 'mysqldb':
|
|
78
|
-
connectionOptions = {
|
|
79
|
-
...(dbType === 'mysqldb' ? (0, config_2.getMysqlConnectionOptions)() : (0, config_2.getMariaDBConnectionOptions)()),
|
|
80
|
-
...(await (0, config_2.getOptionOverrides)('mysqldb')),
|
|
81
|
-
timezone: 'Z',
|
|
82
|
-
};
|
|
83
|
-
break;
|
|
84
|
-
case 'sqlite':
|
|
85
|
-
connectionOptions = (0, config_2.getSqliteConnectionOptions)();
|
|
86
|
-
break;
|
|
87
|
-
default:
|
|
88
|
-
throw new Error(`The database "${dbType}" is currently not supported!`);
|
|
89
|
-
}
|
|
90
|
-
}
|
|
84
|
+
const connectionOptions = testConnectionOptions !== null && testConnectionOptions !== void 0 ? testConnectionOptions : (await getConnectionOptions(dbType));
|
|
91
85
|
let loggingOption = (await GenericHelpers.getConfigValue('database.logging.enabled'));
|
|
92
86
|
if (loggingOption) {
|
|
93
87
|
const optionsString = (await GenericHelpers.getConfigValue('database.logging.options')).replace(/\s+/g, '');
|
|
@@ -104,18 +98,18 @@ async function init(testConnectionOptions) {
|
|
|
104
98
|
synchronize: false,
|
|
105
99
|
logging: loggingOption,
|
|
106
100
|
maxQueryExecutionTime,
|
|
101
|
+
migrationsTransactionMode: 'each',
|
|
107
102
|
});
|
|
108
103
|
exports.connection = await (0, typeorm_1.createConnection)(connectionOptions);
|
|
109
104
|
if (!testConnectionOptions && dbType === 'sqlite') {
|
|
110
105
|
let migrations = [];
|
|
111
106
|
try {
|
|
107
|
+
const entityPrefix = config_1.default.getEnv('database.tablePrefix');
|
|
112
108
|
migrations = await exports.connection.query(`SELECT id FROM ${entityPrefix}migrations where name = "MakeStoppedAtNullable1607431743769"`);
|
|
113
109
|
}
|
|
114
110
|
catch (error) {
|
|
115
111
|
}
|
|
116
|
-
await exports.connection.runMigrations(
|
|
117
|
-
transaction: 'none',
|
|
118
|
-
});
|
|
112
|
+
await exports.connection.runMigrations();
|
|
119
113
|
if (migrations.length === 0) {
|
|
120
114
|
await exports.connection.close();
|
|
121
115
|
exports.connection = await (0, typeorm_1.createConnection)(connectionOptions);
|
package/dist/Db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Db.js","sourceRoot":"","sources":["../src/Db.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,qCAUiB;AAGjB,iEAAmD;AAEnD,sDAA8B;AAE9B,2CAAwC;AACxC,uCAMoB;AAET,QAAA,aAAa,GAAG,KAAK,CAAC;AACpB,QAAA,WAAW,GAAG,EAA0B,CAAC;AAI/C,KAAK,UAAU,WAAW,CAAI,EAAgD;IACpF,OAAO,kBAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AACnC,CAAC;AAFD,kCAEC;AAED,SAAgB,cAAc,CAC7B,WAAiC;IAEjC,OAAO,IAAA,uBAAa,EAAC,WAAW,EAAE,kBAAU,CAAC,IAAI,CAAC,CAAC;AACpD,CAAC;AAJD,wCAIC;AAEM,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"Db.js","sourceRoot":"","sources":["../src/Db.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
const typeorm_1 = require("typeorm");
|
|
29
|
-
const Db = __importStar(require("../../../../Db"));
|
|
30
29
|
const ActiveWorkflowRunner = __importStar(require("../../../../ActiveWorkflowRunner"));
|
|
31
30
|
const config_1 = __importDefault(require("../../../../config"));
|
|
32
31
|
const WorkflowEntity_1 = require("../../../../databases/entities/WorkflowEntity");
|
|
@@ -37,6 +36,7 @@ const global_middleware_1 = require("../../shared/middlewares/global.middleware"
|
|
|
37
36
|
const pagination_service_1 = require("../../shared/services/pagination.service");
|
|
38
37
|
const users_service_1 = require("../users/users.service");
|
|
39
38
|
const workflows_service_1 = require("./workflows.service");
|
|
39
|
+
const workflows_services_1 = require("../../../../workflows/workflows.services");
|
|
40
40
|
module.exports = {
|
|
41
41
|
createWorkflow: [
|
|
42
42
|
(0, global_middleware_1.authorize)(['owner', 'member']),
|
|
@@ -58,18 +58,12 @@ module.exports = {
|
|
|
58
58
|
deleteWorkflow: [
|
|
59
59
|
(0, global_middleware_1.authorize)(['owner', 'member']),
|
|
60
60
|
async (req, res) => {
|
|
61
|
-
const { id } = req.params;
|
|
62
|
-
const
|
|
63
|
-
if (!
|
|
61
|
+
const { id: workflowId } = req.params;
|
|
62
|
+
const workflow = await workflows_services_1.WorkflowsService.delete(req.user, workflowId);
|
|
63
|
+
if (!workflow) {
|
|
64
64
|
return res.status(404).json({ message: 'Not Found' });
|
|
65
65
|
}
|
|
66
|
-
|
|
67
|
-
await ActiveWorkflowRunner.getInstance().remove(id);
|
|
68
|
-
}
|
|
69
|
-
await Db.collections.Workflow.delete(id);
|
|
70
|
-
void InternalHooksManager_1.InternalHooksManager.getInstance().onWorkflowDeleted(req.user, id, true);
|
|
71
|
-
await (0, ExternalHooks_1.ExternalHooks)().run('workflow.afterDelete', [id]);
|
|
72
|
-
return res.json(sharedWorkflow.workflow);
|
|
66
|
+
return res.json(workflow);
|
|
73
67
|
},
|
|
74
68
|
],
|
|
75
69
|
getWorkflow: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflows.handler.js","sourceRoot":"","sources":["../../../../../src/PublicApi/v1/handlers/workflows/workflows.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAA8D;AAE9D,
|
|
1
|
+
{"version":3,"file":"workflows.handler.js","sourceRoot":"","sources":["../../../../../src/PublicApi/v1/handlers/workflows/workflows.handler.ts"],"names":[],"mappings":"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"}
|