n8n 1.49.0 → 1.50.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/LICENSE_EE.md +27 -0
- package/dist/CredentialsOverwrites.d.ts +2 -1
- package/dist/CredentialsOverwrites.js +5 -7
- package/dist/CredentialsOverwrites.js.map +1 -1
- package/dist/Interfaces.d.ts +1 -13
- package/dist/Interfaces.js.map +1 -1
- package/dist/InternalHooks.d.ts +3 -1
- package/dist/InternalHooks.js +27 -24
- package/dist/InternalHooks.js.map +1 -1
- package/dist/Ldap/{helpers.js → helpers.ee.js} +1 -1
- package/dist/Ldap/helpers.ee.js.map +1 -0
- package/dist/Ldap/{ldap.controller.d.ts → ldap.controller.ee.d.ts} +1 -1
- package/dist/Ldap/{ldap.controller.js → ldap.controller.ee.js} +5 -5
- package/dist/Ldap/ldap.controller.ee.js.map +1 -0
- package/dist/Ldap/{ldap.service.js → ldap.service.ee.js} +16 -16
- package/dist/Ldap/ldap.service.ee.js.map +1 -0
- package/dist/Queue.d.ts +1 -4
- package/dist/Queue.js +11 -2
- package/dist/Queue.js.map +1 -1
- package/dist/Server.d.ts +0 -1
- package/dist/Server.js +30 -20
- package/dist/Server.js.map +1 -1
- package/dist/UserManagement/email/NodeMailer.d.ts +5 -5
- package/dist/UserManagement/email/NodeMailer.js +24 -59
- package/dist/UserManagement/email/NodeMailer.js.map +1 -1
- package/dist/UserManagement/email/UserManagementMailer.d.ts +13 -6
- package/dist/UserManagement/email/UserManagementMailer.js +38 -44
- package/dist/UserManagement/email/UserManagementMailer.js.map +1 -1
- package/dist/WorkflowRunner.js +1 -2
- package/dist/WorkflowRunner.js.map +1 -1
- package/dist/auth/methods/email.js +2 -2
- package/dist/auth/methods/email.js.map +1 -1
- package/dist/auth/methods/ldap.js +12 -12
- package/dist/auth/methods/ldap.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/BaseCommand.js +19 -17
- package/dist/commands/BaseCommand.js.map +1 -1
- package/dist/commands/start.js +19 -17
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/worker.js +11 -10
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.d.ts +0 -78
- package/dist/config/index.js +28 -2
- package/dist/config/index.js.map +1 -1
- package/dist/config/schema.d.ts +0 -318
- package/dist/config/schema.js +0 -318
- package/dist/config/schema.js.map +1 -1
- package/dist/constants.d.ts +3 -1
- package/dist/constants.js +4 -2
- package/dist/constants.js.map +1 -1
- package/dist/credentials/credentials.controller.d.ts +3 -1
- package/dist/credentials/credentials.controller.js +7 -8
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +0 -1
- package/dist/credentials/credentials.service.js +1 -1
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/databases/config.js +29 -26
- package/dist/databases/config.js.map +1 -1
- package/dist/databases/dsl/Column.d.ts +2 -0
- package/dist/databases/dsl/Column.js +7 -1
- package/dist/databases/dsl/Column.js.map +1 -1
- package/dist/databases/entities/AbstractEntity.d.ts +1 -0
- package/dist/databases/entities/AbstractEntity.js +7 -9
- package/dist/databases/entities/AbstractEntity.js.map +1 -1
- package/dist/databases/entities/ExecutionMetadata.d.ts +1 -1
- package/dist/databases/entities/ExecutionMetadata.js +2 -2
- package/dist/databases/entities/ExecutionMetadata.js.map +1 -1
- package/dist/databases/entities/WorkflowEntity.js +1 -5
- package/dist/databases/entities/WorkflowEntity.js.map +1 -1
- package/dist/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.d.ts +5 -0
- package/dist/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.js +80 -0
- package/dist/databases/migrations/common/1720101653148-AddConstraintToExecutionMetadata.js.map +1 -0
- package/dist/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.d.ts +1 -1
- package/dist/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.js +2 -7
- package/dist/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.js.map +1 -1
- package/dist/databases/migrations/mysqldb/index.js +2 -0
- package/dist/databases/migrations/mysqldb/index.js.map +1 -1
- package/dist/databases/migrations/postgresdb/index.js +2 -0
- package/dist/databases/migrations/postgresdb/index.js.map +1 -1
- package/dist/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.js +2 -2
- package/dist/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.js.map +1 -1
- package/dist/databases/migrations/sqlite/index.js +2 -0
- package/dist/databases/migrations/sqlite/index.js.map +1 -1
- package/dist/databases/repositories/execution.repository.d.ts +3 -1
- package/dist/databases/repositories/execution.repository.js +6 -3
- package/dist/databases/repositories/execution.repository.js.map +1 -1
- package/dist/databases/repositories/usageMetrics.repository.d.ts +3 -1
- package/dist/databases/repositories/usageMetrics.repository.js +8 -9
- package/dist/databases/repositories/usageMetrics.repository.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.d.ts +3 -1
- package/dist/databases/repositories/workflow.repository.js +9 -5
- package/dist/databases/repositories/workflow.repository.js.map +1 -1
- package/dist/databases/repositories/workflowStatistics.repository.d.ts +3 -2
- package/dist/databases/repositories/workflowStatistics.repository.js +8 -9
- package/dist/databases/repositories/workflowStatistics.repository.js.map +1 -1
- package/dist/databases/utils/migrationHelpers.js +5 -7
- package/dist/databases/utils/migrationHelpers.js.map +1 -1
- package/dist/databases/utils/transformers.js +3 -5
- package/dist/databases/utils/transformers.js.map +1 -1
- package/dist/decorators/OnShutdown.js +2 -1
- package/dist/decorators/OnShutdown.js.map +1 -1
- package/dist/executions/execution.service.d.ts +3 -1
- package/dist/executions/execution.service.js +11 -5
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/push/abstract.push.d.ts +4 -11
- package/dist/push/abstract.push.js +5 -26
- package/dist/push/abstract.push.js.map +1 -1
- package/dist/push/index.d.ts +4 -5
- package/dist/push/index.js +14 -13
- package/dist/push/index.js.map +1 -1
- package/dist/push/sse.push.d.ts +2 -4
- package/dist/push/sse.push.js +5 -6
- package/dist/push/sse.push.js.map +1 -1
- package/dist/push/types.d.ts +0 -6
- package/dist/push/websocket.push.d.ts +2 -4
- package/dist/push/websocket.push.js +5 -21
- package/dist/push/websocket.push.js.map +1 -1
- package/dist/requests.d.ts +0 -7
- package/dist/services/executionMetadata.service.d.ts +1 -2
- package/dist/services/executionMetadata.service.js +4 -2
- package/dist/services/executionMetadata.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +3 -1
- package/dist/services/frontend.service.js +73 -75
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/redis/RedisServiceBaseClasses.js +0 -3
- package/dist/services/redis/RedisServiceBaseClasses.js.map +1 -1
- package/dist/services/redis/redis-client.service.js +3 -1
- package/dist/services/redis/redis-client.service.js.map +1 -1
- package/dist/shutdown/Shutdown.service.js +4 -0
- package/dist/shutdown/Shutdown.service.js.map +1 -1
- package/dist/workflows/workflow.service.ee.js +1 -1
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflowStaticData.service.d.ts +3 -1
- package/dist/workflows/workflowStaticData.service.js +6 -7
- package/dist/workflows/workflowStaticData.service.js.map +1 -1
- package/package.json +24 -30
- package/dist/Ldap/helpers.js.map +0 -1
- package/dist/Ldap/ldap.controller.js.map +0 -1
- package/dist/Ldap/ldap.service.js.map +0 -1
- package/dist/collaboration/collaboration.message.d.ts +0 -11
- package/dist/collaboration/collaboration.message.js +0 -15
- package/dist/collaboration/collaboration.message.js.map +0 -1
- package/dist/collaboration/collaboration.service.d.ts +0 -17
- package/dist/collaboration/collaboration.service.js +0 -100
- package/dist/collaboration/collaboration.service.js.map +0 -1
- package/dist/collaboration/collaboration.state.d.ts +0 -14
- package/dist/collaboration/collaboration.state.js +0 -64
- package/dist/collaboration/collaboration.state.js.map +0 -1
- package/dist/controllers/ai.controller.d.ts +0 -10
- package/dist/controllers/ai.controller.js +0 -42
- package/dist/controllers/ai.controller.js.map +0 -1
- package/dist/errors/response-errors/failed-dependency.error.d.ts +0 -4
- package/dist/errors/response-errors/failed-dependency.error.js +0 -11
- package/dist/errors/response-errors/failed-dependency.error.js.map +0 -1
- package/dist/services/ai/prompts/generateCurl.d.ts +0 -10
- package/dist/services/ai/prompts/generateCurl.js +0 -65
- package/dist/services/ai/prompts/generateCurl.js.map +0 -1
- package/dist/services/ai/prompts/retrieveService.d.ts +0 -6
- package/dist/services/ai/prompts/retrieveService.js +0 -20
- package/dist/services/ai/prompts/retrieveService.js.map +0 -1
- package/dist/services/ai/providers/openai.d.ts +0 -16
- package/dist/services/ai/providers/openai.js +0 -52
- package/dist/services/ai/providers/openai.js.map +0 -1
- package/dist/services/ai/resources/api-knowledgebase.json +0 -2651
- package/dist/services/ai/schemas/generateCurl.d.ts +0 -8
- package/dist/services/ai/schemas/generateCurl.js +0 -10
- package/dist/services/ai/schemas/generateCurl.js.map +0 -1
- package/dist/services/ai/schemas/retrieveService.d.ts +0 -8
- package/dist/services/ai/schemas/retrieveService.js +0 -10
- package/dist/services/ai/schemas/retrieveService.js.map +0 -1
- package/dist/services/ai/utils/summarizeNodeTypeProperties.d.ts +0 -4
- package/dist/services/ai/utils/summarizeNodeTypeProperties.js +0 -36
- package/dist/services/ai/utils/summarizeNodeTypeProperties.js.map +0 -1
- package/dist/services/ai.service.d.ts +0 -24
- package/dist/services/ai.service.js +0 -133
- package/dist/services/ai.service.js.map +0 -1
- package/dist/types/ai.types.d.ts +0 -6
- package/dist/types/ai.types.js +0 -3
- package/dist/types/ai.types.js.map +0 -1
- /package/dist/Ldap/{helpers.d.ts → helpers.ee.d.ts} +0 -0
- /package/dist/Ldap/{ldap.service.d.ts → ldap.service.ee.d.ts} +0 -0
|
@@ -8,13 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.UsageMetricsRepository = exports.UsageMetrics = void 0;
|
|
16
|
-
const config_1 = __importDefault(require("../../config"));
|
|
17
13
|
const typedi_1 = require("typedi");
|
|
14
|
+
const config_1 = require("@n8n/config");
|
|
18
15
|
const typeorm_1 = require("@n8n/typeorm");
|
|
19
16
|
let UsageMetrics = class UsageMetrics {
|
|
20
17
|
};
|
|
@@ -23,15 +20,16 @@ exports.UsageMetrics = UsageMetrics = __decorate([
|
|
|
23
20
|
(0, typeorm_1.Entity)()
|
|
24
21
|
], UsageMetrics);
|
|
25
22
|
let UsageMetricsRepository = class UsageMetricsRepository extends typeorm_1.Repository {
|
|
26
|
-
constructor(dataSource) {
|
|
23
|
+
constructor(dataSource, globalConfig) {
|
|
27
24
|
super(UsageMetrics, dataSource.manager);
|
|
25
|
+
this.globalConfig = globalConfig;
|
|
28
26
|
}
|
|
29
27
|
toTableName(name) {
|
|
30
|
-
const tablePrefix =
|
|
31
|
-
let tableName =
|
|
28
|
+
const tablePrefix = this.globalConfig.database.tablePrefix;
|
|
29
|
+
let tableName = this.globalConfig.database.type === 'mysqldb'
|
|
32
30
|
? `\`${tablePrefix}${name}\``
|
|
33
31
|
: `"${tablePrefix}${name}"`;
|
|
34
|
-
const pgSchema =
|
|
32
|
+
const pgSchema = this.globalConfig.database.postgresdb.schema;
|
|
35
33
|
if (pgSchema !== 'public')
|
|
36
34
|
tableName = [pgSchema, tablePrefix + name].join('.');
|
|
37
35
|
return tableName;
|
|
@@ -66,6 +64,7 @@ let UsageMetricsRepository = class UsageMetricsRepository extends typeorm_1.Repo
|
|
|
66
64
|
exports.UsageMetricsRepository = UsageMetricsRepository;
|
|
67
65
|
exports.UsageMetricsRepository = UsageMetricsRepository = __decorate([
|
|
68
66
|
(0, typedi_1.Service)(),
|
|
69
|
-
__metadata("design:paramtypes", [typeorm_1.DataSource
|
|
67
|
+
__metadata("design:paramtypes", [typeorm_1.DataSource,
|
|
68
|
+
config_1.GlobalConfig])
|
|
70
69
|
], UsageMetricsRepository);
|
|
71
70
|
//# sourceMappingURL=usageMetrics.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usageMetrics.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/usageMetrics.repository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"usageMetrics.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/usageMetrics.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AACjC,wCAA2C;AAC3C,0CAA8D;AAGvD,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IADxB,IAAA,gBAAM,GAAE;GACI,YAAY,CAAG;AAGrB,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,oBAAwB;IACnE,YACC,UAAsB,EACL,YAA0B;QAE3C,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QAFvB,iBAAY,GAAZ,YAAY,CAAc;IAG5C,CAAC;IAED,WAAW,CAAC,IAAY;QACvB,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC;QAE3D,IAAI,SAAS,GACZ,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS;YAC5C,CAAC,CAAC,KAAK,WAAW,GAAG,IAAI,IAAI;YAC7B,CAAC,CAAC,IAAI,WAAW,GAAG,IAAI,GAAG,CAAC;QAE9B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QAE9D,IAAI,QAAQ,KAAK,QAAQ;YAAE,SAAS,GAAG,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhF,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,wBAAwB;QAW7B,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QAC1D,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;QAC/D,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QAEnE,MAAM,CACL,EACC,kBAAkB,EAAE,YAAY,EAChC,gBAAgB,EAAE,UAAU,EAC5B,qBAAqB,EAAE,eAAe,EACtC,oBAAoB,EAAE,cAAc,EACpC,uBAAuB,EAAE,gBAAgB,EACzC,2BAA2B,EAAE,oBAAoB,EACjD,uBAAuB,EAAE,gBAAgB,GACzC,EACD,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC;;4BAEI,SAAS;4BACT,SAAS;4BACT,aAAa;4BACb,aAAa;4BACb,eAAe;8BACb,kBAAkB;8BAClB,kBAAkB;GAC7C,CAAC,CAAU,CAAC;QAEb,MAAM,QAAQ,GAAG,CAAC,KAAsB,EAAE,EAAE,CAC3C,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAEhE,OAAO;YACN,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC;YACpC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC;YAChC,eAAe,EAAE,QAAQ,CAAC,eAAe,CAAC;YAC1C,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC;YACxC,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB,CAAC;YAC5C,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB,CAAC;YACpD,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB,CAAC;SAC5C,CAAC;IACH,CAAC;CACD,CAAA;AAzEY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,gBAAO,GAAE;qCAGI,oBAAU;QACS,qBAAY;GAHhC,sBAAsB,CAyElC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { GlobalConfig } from '@n8n/config';
|
|
1
2
|
import { DataSource, Repository, type UpdateResult, type FindOptionsWhere, type FindOptionsRelations } from '@n8n/typeorm';
|
|
2
3
|
import type { ListQuery } from '../../requests';
|
|
3
4
|
import { WorkflowEntity } from '../entities/WorkflowEntity';
|
|
4
5
|
export declare class WorkflowRepository extends Repository<WorkflowEntity> {
|
|
5
|
-
|
|
6
|
+
private readonly globalConfig;
|
|
7
|
+
constructor(dataSource: DataSource, globalConfig: GlobalConfig);
|
|
6
8
|
get(where: FindOptionsWhere<WorkflowEntity>, options?: {
|
|
7
9
|
relations: string[] | FindOptionsRelations<WorkflowEntity>;
|
|
8
10
|
}): Promise<WorkflowEntity | null>;
|
|
@@ -14,14 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.WorkflowRepository = void 0;
|
|
16
16
|
const typedi_1 = require("typedi");
|
|
17
|
+
const config_1 = require("@n8n/config");
|
|
17
18
|
const typeorm_1 = require("@n8n/typeorm");
|
|
18
19
|
const utils_1 = require("../../utils");
|
|
19
|
-
const
|
|
20
|
+
const config_2 = __importDefault(require("../../config"));
|
|
20
21
|
const WorkflowEntity_1 = require("../entities/WorkflowEntity");
|
|
21
22
|
const WebhookEntity_1 = require("../entities/WebhookEntity");
|
|
22
23
|
let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
|
|
23
|
-
constructor(dataSource) {
|
|
24
|
+
constructor(dataSource, globalConfig) {
|
|
24
25
|
super(WorkflowEntity_1.WorkflowEntity, dataSource.manager);
|
|
26
|
+
this.globalConfig = globalConfig;
|
|
25
27
|
}
|
|
26
28
|
async get(where, options) {
|
|
27
29
|
return await this.findOne({
|
|
@@ -64,12 +66,13 @@ let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
|
|
|
64
66
|
}
|
|
65
67
|
async updateWorkflowTriggerCount(id, triggerCount) {
|
|
66
68
|
const qb = this.createQueryBuilder('workflow');
|
|
69
|
+
const dbType = this.globalConfig.database.type;
|
|
67
70
|
return await qb
|
|
68
71
|
.update()
|
|
69
72
|
.set({
|
|
70
73
|
triggerCount,
|
|
71
74
|
updatedAt: () => {
|
|
72
|
-
if (['mysqldb', 'mariadb'].includes(
|
|
75
|
+
if (['mysqldb', 'mariadb'].includes(dbType)) {
|
|
73
76
|
return 'updatedAt';
|
|
74
77
|
}
|
|
75
78
|
return '"updatedAt"';
|
|
@@ -106,7 +109,7 @@ let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
|
|
|
106
109
|
};
|
|
107
110
|
select === null || select === void 0 ? true : delete select.ownedBy;
|
|
108
111
|
const relations = [];
|
|
109
|
-
const areTagsEnabled = !
|
|
112
|
+
const areTagsEnabled = !config_2.default.getEnv('workflowTagsDisabled');
|
|
110
113
|
const isDefaultSelect = (options === null || options === void 0 ? void 0 : options.select) === undefined;
|
|
111
114
|
const areTagsRequested = isDefaultSelect || ((_c = options === null || options === void 0 ? void 0 : options.select) === null || _c === void 0 ? void 0 : _c.tags) === true;
|
|
112
115
|
const isOwnedByIncluded = isDefaultSelect || ((_d = options === null || options === void 0 ? void 0 : options.select) === null || _d === void 0 ? void 0 : _d.ownedBy) === true;
|
|
@@ -170,6 +173,7 @@ let WorkflowRepository = class WorkflowRepository extends typeorm_1.Repository {
|
|
|
170
173
|
exports.WorkflowRepository = WorkflowRepository;
|
|
171
174
|
exports.WorkflowRepository = WorkflowRepository = __decorate([
|
|
172
175
|
(0, typedi_1.Service)(),
|
|
173
|
-
__metadata("design:paramtypes", [typeorm_1.DataSource
|
|
176
|
+
__metadata("design:paramtypes", [typeorm_1.DataSource,
|
|
177
|
+
config_1.GlobalConfig])
|
|
174
178
|
], WorkflowRepository);
|
|
175
179
|
//# sourceMappingURL=workflow.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/workflow.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAiC;AACjC,0CAUsB;AAEtB,mCAAwC;AACxC,sDAA8B;AAC9B,+DAA4D;AAC5D,6DAA0D;AAGnD,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,oBAA0B;IACjE,
|
|
1
|
+
{"version":3,"file":"workflow.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/workflow.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
+
import { GlobalConfig } from '@n8n/config';
|
|
1
2
|
import { DataSource, Repository } from '@n8n/typeorm';
|
|
2
3
|
import { StatisticsNames, WorkflowStatistics } from '../entities/WorkflowStatistics';
|
|
3
4
|
import type { User } from '../../databases/entities/User';
|
|
4
5
|
type StatisticsInsertResult = 'insert' | 'failed' | 'alreadyExists';
|
|
5
6
|
type StatisticsUpsertResult = StatisticsInsertResult | 'update';
|
|
6
7
|
export declare class WorkflowStatisticsRepository extends Repository<WorkflowStatistics> {
|
|
7
|
-
private readonly
|
|
8
|
-
constructor(dataSource: DataSource);
|
|
8
|
+
private readonly globalConfig;
|
|
9
|
+
constructor(dataSource: DataSource, globalConfig: GlobalConfig);
|
|
9
10
|
insertWorkflowStatistics(eventName: StatisticsNames, workflowId: string): Promise<StatisticsInsertResult>;
|
|
10
11
|
upsertWorkflowStatistics(eventName: StatisticsNames, workflowId: string): Promise<StatisticsUpsertResult>;
|
|
11
12
|
queryNumWorkflowsUserHasWithFiveOrMoreProdExecs(userId: User['id']): Promise<number>;
|
|
@@ -8,19 +8,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.WorkflowStatisticsRepository = void 0;
|
|
16
13
|
const typedi_1 = require("typedi");
|
|
14
|
+
const config_1 = require("@n8n/config");
|
|
17
15
|
const typeorm_1 = require("@n8n/typeorm");
|
|
18
|
-
const config_1 = __importDefault(require("../../config"));
|
|
19
16
|
const WorkflowStatistics_1 = require("../entities/WorkflowStatistics");
|
|
20
17
|
let WorkflowStatisticsRepository = class WorkflowStatisticsRepository extends typeorm_1.Repository {
|
|
21
|
-
constructor(dataSource) {
|
|
18
|
+
constructor(dataSource, globalConfig) {
|
|
22
19
|
super(WorkflowStatistics_1.WorkflowStatistics, dataSource.manager);
|
|
23
|
-
this.
|
|
20
|
+
this.globalConfig = globalConfig;
|
|
24
21
|
}
|
|
25
22
|
async insertWorkflowStatistics(eventName, workflowId) {
|
|
26
23
|
try {
|
|
@@ -48,9 +45,10 @@ let WorkflowStatisticsRepository = class WorkflowStatisticsRepository extends ty
|
|
|
48
45
|
}
|
|
49
46
|
}
|
|
50
47
|
async upsertWorkflowStatistics(eventName, workflowId) {
|
|
48
|
+
const dbType = this.globalConfig.database.type;
|
|
51
49
|
const { tableName } = this.metadata;
|
|
52
50
|
try {
|
|
53
|
-
if (
|
|
51
|
+
if (dbType === 'sqlite') {
|
|
54
52
|
await this.query(`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
|
|
55
53
|
VALUES (1, "${eventName}", "${workflowId}", CURRENT_TIMESTAMP)
|
|
56
54
|
ON CONFLICT (workflowId, name)
|
|
@@ -64,7 +62,7 @@ let WorkflowStatisticsRepository = class WorkflowStatisticsRepository extends ty
|
|
|
64
62
|
});
|
|
65
63
|
return (counter === null || counter === void 0 ? void 0 : counter.count) === 1 ? 'insert' : 'failed';
|
|
66
64
|
}
|
|
67
|
-
else if (
|
|
65
|
+
else if (dbType === 'postgresdb') {
|
|
68
66
|
const queryResult = (await this.query(`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
|
|
69
67
|
VALUES (1, '${eventName}', '${workflowId}', CURRENT_TIMESTAMP)
|
|
70
68
|
ON CONFLICT ("name", "workflowId")
|
|
@@ -105,6 +103,7 @@ let WorkflowStatisticsRepository = class WorkflowStatisticsRepository extends ty
|
|
|
105
103
|
exports.WorkflowStatisticsRepository = WorkflowStatisticsRepository;
|
|
106
104
|
exports.WorkflowStatisticsRepository = WorkflowStatisticsRepository = __decorate([
|
|
107
105
|
(0, typedi_1.Service)(),
|
|
108
|
-
__metadata("design:paramtypes", [typeorm_1.DataSource
|
|
106
|
+
__metadata("design:paramtypes", [typeorm_1.DataSource,
|
|
107
|
+
config_1.GlobalConfig])
|
|
109
108
|
], WorkflowStatisticsRepository);
|
|
110
109
|
//# sourceMappingURL=workflowStatistics.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflowStatistics.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/workflowStatistics.repository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workflowStatistics.repository.js","sourceRoot":"","sources":["../../../src/databases/repositories/workflowStatistics.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.wrapMigration = void 0;
|
|
7
4
|
const typedi_1 = require("typedi");
|
|
5
|
+
const config_1 = require("@n8n/config");
|
|
8
6
|
const fs_1 = require("fs");
|
|
9
7
|
const n8n_core_1 = require("n8n-core");
|
|
10
8
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
11
|
-
const config_1 = __importDefault(require("../../config"));
|
|
12
9
|
const constants_1 = require("../../constants");
|
|
13
10
|
const dsl_1 = require("../dsl");
|
|
14
11
|
const NodeTypes_1 = require("../../NodeTypes");
|
|
@@ -82,10 +79,11 @@ const runDisablingForeignKeys = async (migration, context, fn) => {
|
|
|
82
79
|
function parseJson(data) {
|
|
83
80
|
return typeof data === 'string' ? (0, n8n_workflow_1.jsonParse)(data) : data;
|
|
84
81
|
}
|
|
85
|
-
const
|
|
82
|
+
const globalConfig = typedi_1.Container.get(config_1.GlobalConfig);
|
|
83
|
+
const dbType = globalConfig.database.type;
|
|
86
84
|
const isMysql = ['mariadb', 'mysqldb'].includes(dbType);
|
|
87
|
-
const dbName =
|
|
88
|
-
const tablePrefix =
|
|
85
|
+
const dbName = globalConfig.database[dbType === 'mariadb' ? 'mysqldb' : dbType].database;
|
|
86
|
+
const tablePrefix = globalConfig.database.tablePrefix;
|
|
89
87
|
const createContext = (queryRunner, migration) => ({
|
|
90
88
|
logger: typedi_1.Container.get(Logger_1.Logger),
|
|
91
89
|
tablePrefix,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrationHelpers.js","sourceRoot":"","sources":["../../../src/databases/utils/migrationHelpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrationHelpers.js","sourceRoot":"","sources":["../../../src/databases/utils/migrationHelpers.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,wCAA2C;AAC3C,2BAA0C;AAC1C,uCAA4C;AAG5C,+CAA2D;AAE3D,2CAAqC;AAErC,iCAA8C;AAC9C,2CAAwC;AACxC,qCAAkC;AAElC,MAAM,+BAA+B,GAAG,4BAA4B,CAAC;AAErE,SAAS,kBAAkB;IAC1B,IAAI,CAAC;QACJ,MAAM,QAAQ,GAAG,GAChB,kBAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC,SACjC,IAAI,+BAA+B,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACnD,IAAA,WAAM,EAAC,QAAQ,CAAC,CAAC;QACjB,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAW,CAAC;QAC/D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,+BAAgB,CAAC,gCAAgC,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACP,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE;gBACnD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvD,OAAO,GAAG,GAAG,CAAC,CAAC;gBAChB,CAAC;gBACD,OAAO,GAAG,CAAC;YACZ,CAAC,EAAE,CAAC,CAAC,CAAC;YACN,IAAI,SAAS,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;gBAClC,MAAM,IAAI,+BAAgB,CAAC,kCAAkC,CAAC,CAAC;YAChE,CAAC;QACF,CAAC;QACD,OAAO,UAAU,CAAC;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACb,CAAC;AACF,CAAC;AAED,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B,SAAS,iBAAiB,CAAC,aAAqB;IAC/C,IAAI,kBAAM;QAAE,OAAO;IAEnB,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC;IACrC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;QACvE,iBAAiB,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,sBAAsB,aAAa,EAAE,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,eAAe,CAAC,aAAqB;IAC7C,IAAI,kBAAM;QAAE,OAAO;IAEnB,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC;IACrC,MAAM,CAAC,IAAI,CAAC,sBAAsB,aAAa,EAAE,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,uBAAuB,GAAG,KAAK,EACpC,SAAwB,EACxB,OAAyB,EACzB,EAAe,EACd,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACxC,IAAI,MAAM,KAAK,QAAQ;QACtB,MAAM,IAAI,+BAAgB,CAAC,iDAAiD,CAAC,CAAC;IAC/E,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IACnD,MAAM,WAAW,CAAC,gBAAgB,EAAE,CAAC;IACrC,IAAI,CAAC;QACJ,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClC,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;IACvC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,IAAI,CAAC;YACJ,MAAM,WAAW,CAAC,mBAAmB,EAAE,CAAC;QACzC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QACV,MAAM,CAAC,CAAC;IACT,CAAC;YAAS,CAAC;QACV,MAAM,WAAW,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC;AACF,CAAC,CAAC;AAEF,SAAS,SAAS,CAAI,IAAgB;IACrC,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,wBAAS,EAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC;AAED,MAAM,YAAY,GAAG,kBAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;AACjD,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC;AAC1C,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACxD,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;AACzF,MAAM,WAAW,GAAG,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC;AAEtD,MAAM,aAAa,GAAG,CAAC,WAAwB,EAAE,SAAoB,EAAoB,EAAE,CAAC,CAAC;IAC5F,MAAM,EAAE,kBAAS,CAAC,GAAG,CAAC,eAAM,CAAC;IAC7B,WAAW;IACX,MAAM;IACN,OAAO;IACP,MAAM;IACN,aAAa,EAAE,SAAS,CAAC,IAAI;IAC7B,WAAW;IACX,aAAa,EAAE,IAAA,yBAAmB,EAAC,WAAW,EAAE,WAAW,CAAC;IAC5D,SAAS,EAAE,kBAAS,CAAC,GAAG,CAAC,qBAAS,CAAC;IACnC,kBAAkB;IAClB,SAAS;IACT,MAAM,EAAE;QACP,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;QAChE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,GAAG,IAAI,EAAE,CAAC;QAClF,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,WAAW,GAAG,IAAI,EAAE,CAAC;KACtF;IACD,QAAQ,EAAE,KAAK,EAAK,GAAW,EAAE,eAA+B,EAAE,EAAE;QACnE,IAAI,eAAe,EAAE,CAAC;YACrB,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,yBAAyB,CAClF,GAAG,EACH,eAAe,EACf,EAAE,CACF,CAAC;YACF,OAAO,MAAO,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,CAAgB,CAAC;QACnE,CAAC;aAAM,CAAC;YACP,OAAO,MAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAgB,CAAC;QACrD,CAAC;IACF,CAAC;IACD,YAAY,EAAE,KAAK,EAClB,KAAa,EACb,SAA0C,EAC1C,KAAK,GAAG,GAAG,EACV,EAAE;QACH,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,YAAoB,CAAC;QACzB,IAAI,mBAAwB,CAAC;QAE7B,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAElE,GAAG,CAAC;YACH,YAAY,GAAG,GAAG,KAAK,UAAU,KAAK,WAAW,MAAM,EAAE,CAAC;YAC1D,mBAAmB,GAAG,CAAC,MAAM,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,CAAQ,CAAC;YAErE,MAAM,SAAS,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC;QACjB,CAAC,QAAQ,mBAAmB,CAAC,MAAM,KAAK,KAAK,EAAE;IAChD,CAAC;IACD,SAAS,EAAE,KAAK,EACf,SAAiB,EACjB,OAAe,EACf,UAAqB,EACrB,QAAmB,EACnB,SAAkB,EACjB,EAAE;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,UAAU,CAAC;QAC1C,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,GAAG,SAAS,EAAE,CAAC,CAAC;QACxD,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,GAAG,OAAO,EAAE,CAAC,CAAC;QACpD,MAAM,aAAa,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM;YACvC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YACpD,CAAC,CAAC,GAAG,CAAC;QACP,MAAM,WAAW,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;YACnC,CAAC,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YACzD,CAAC,CAAC,EAAE,CAAC;QAEN,MAAM,KAAK,GAAG,MAAM,WAAW;aAC7B,KAAK,CAAC,iCAAiC,SAAS,EAAE,CAAC;aACnD,IAAI,CAAC,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAE1D,SAAS,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;QAC5B,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,OAAO,QAAQ,GAAG,KAAK,EAAE,CAAC;YACzB,MAAM,WAAW,CAAC,KAAK,CACtB,eAAe,OAAO,IAAI,WAAW,WAAW,aAAa,SAAS,SAAS,UAAU,QAAQ,KAAK,SAAS,EAAE,CACjH,CAAC;YACF,QAAQ,IAAI,SAAS,CAAC;QACvB,CAAC;IACF,CAAC;CACD,CAAC,CAAC;AAEI,MAAM,aAAa,GAAG,CAAC,SAAoB,EAAE,EAAE;IACrD,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC;IACzC,IAAI,EAAE,EAAE,CAAC;QACR,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE;YAClC,KAAK,CAAC,EAAE,CAAsB,WAAwB;gBACrD,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAClC,MAAM,OAAO,GAAG,aAAa,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;gBACtD,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;oBAChC,MAAM,uBAAuB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;gBAClD,CAAC;qBAAM,CAAC;oBACP,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC9B,CAAC;gBACD,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACjC,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;SAAM,CAAC;QACP,MAAM,IAAI,+BAAgB,CAAC,cAAc,SAAS,CAAC,IAAI,iCAAiC,CAAC,CAAC;IAC3F,CAAC;IACD,IAAI,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE;YAClC,KAAK,CAAC,IAAI,CAAsB,WAAwB;gBACvD,MAAM,OAAO,GAAG,aAAa,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;gBACtD,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;oBAChC,MAAM,uBAAuB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;gBACpD,CAAC;qBAAM,CAAC;oBACP,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAChC,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC;AA9BW,QAAA,aAAa,iBA8BxB"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.sqlite = exports.objectRetriever = exports.lowerCaser = exports.idStringifier = void 0;
|
|
4
|
+
const typedi_1 = require("typedi");
|
|
5
|
+
const config_1 = require("@n8n/config");
|
|
7
6
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
-
const config_1 = __importDefault(require("../../config"));
|
|
9
7
|
exports.idStringifier = {
|
|
10
8
|
from: (value) => value === null || value === void 0 ? void 0 : value.toString(),
|
|
11
9
|
to: (value) => typeof value === 'string' ? Number(value) : value,
|
|
@@ -19,7 +17,7 @@ exports.objectRetriever = {
|
|
|
19
17
|
from: (value) => (typeof value === 'string' ? (0, n8n_workflow_1.jsonParse)(value) : value),
|
|
20
18
|
};
|
|
21
19
|
const jsonColumn = {
|
|
22
|
-
to: (value) => config_1.
|
|
20
|
+
to: (value) => typedi_1.Container.get(config_1.GlobalConfig).database.type === 'sqlite' ? JSON.stringify(value) : value,
|
|
23
21
|
from: (value) => (typeof value === 'string' ? (0, n8n_workflow_1.jsonParse)(value) : value),
|
|
24
22
|
};
|
|
25
23
|
exports.sqlite = { jsonColumn };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../../../src/databases/utils/transformers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../../../src/databases/utils/transformers.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,wCAA2C;AAE3C,+CAAyC;AAE5B,QAAA,aAAa,GAAG;IAC5B,IAAI,EAAE,CAAC,KAAc,EAAsB,EAAE,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE;IAC/D,EAAE,EAAE,CACH,KAAiD,EACJ,EAAE,CAC/C,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;CAClD,CAAC;AAEW,QAAA,UAAU,GAAG;IACzB,IAAI,EAAE,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK;IACtC,EAAE,EAAE,CAAC,KAAa,EAAU,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;CACxF,CAAC;AAKW,QAAA,eAAe,GAAqB;IAChD,EAAE,EAAE,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK;IACpC,IAAI,EAAE,CAAC,KAAsB,EAAU,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,wBAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;CAChG,CAAC;AAMF,MAAM,UAAU,GAAqB;IACpC,EAAE,EAAE,CAAC,KAAa,EAAmB,EAAE,CACtC,kBAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;IACvF,IAAI,EAAE,CAAC,KAAsB,EAAU,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,wBAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;CAChG,CAAC;AAEW,QAAA,MAAM,GAAG,EAAE,UAAU,EAAE,CAAC"}
|
|
@@ -4,7 +4,8 @@ exports.OnShutdown = void 0;
|
|
|
4
4
|
const typedi_1 = require("typedi");
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
6
|
const Shutdown_service_1 = require("../shutdown/Shutdown.service");
|
|
7
|
-
const
|
|
7
|
+
const constants_1 = require("../constants");
|
|
8
|
+
const OnShutdown = (priority = constants_1.DEFAULT_SHUTDOWN_PRIORITY) => (prototype, propertyKey, descriptor) => {
|
|
8
9
|
const serviceClass = prototype.constructor;
|
|
9
10
|
const methodName = String(propertyKey);
|
|
10
11
|
if (typeof (descriptor === null || descriptor === void 0 ? void 0 : descriptor.value) === 'function') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnShutdown.js","sourceRoot":"","sources":["../../src/decorators/OnShutdown.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,+CAAgD;AAChD,kEAAiF;
|
|
1
|
+
{"version":3,"file":"OnShutdown.js","sourceRoot":"","sources":["../../src/decorators/OnShutdown.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,+CAAgD;AAChD,kEAAiF;AACjF,2CAAwD;AAqBjD,MAAM,UAAU,GACtB,CAAC,QAAQ,GAAG,qCAAyB,EAAmB,EAAE,CAC1D,CAAC,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE;IACtC,MAAM,YAAY,GAAG,SAAS,CAAC,WAA2B,CAAC;IAC3D,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAEvC,IAAI,OAAO,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAA,KAAK,UAAU,EAAE,CAAC;QAC7C,kBAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;IACjF,CAAC;SAAM,CAAC;QACP,MAAM,IAAI,GAAG,GAAG,YAAY,CAAC,IAAI,IAAI,UAAU,IAAI,CAAC;QACpD,MAAM,IAAI,+BAAgB,CACzB,GAAG,IAAI,wBAAwB,YAAY,CAAC,IAAI,sBAAsB,CACtE,CAAC;IACH,CAAC;AACF,CAAC,CAAC;AAdU,QAAA,UAAU,cAcpB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GlobalConfig } from '@n8n/config';
|
|
1
2
|
import type { ExecutionError, INode, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
3
|
import { Workflow } from 'n8n-workflow';
|
|
3
4
|
import { ActiveExecutions } from '../ActiveExecutions';
|
|
@@ -75,6 +76,7 @@ export declare const schemaGetExecutionsQueryFilter: {
|
|
|
75
76
|
};
|
|
76
77
|
export declare const allowedExecutionsQueryFilterFields: string[];
|
|
77
78
|
export declare class ExecutionService {
|
|
79
|
+
private readonly globalConfig;
|
|
78
80
|
private readonly logger;
|
|
79
81
|
private readonly queue;
|
|
80
82
|
private readonly activeExecutions;
|
|
@@ -85,7 +87,7 @@ export declare class ExecutionService {
|
|
|
85
87
|
private readonly workflowRunner;
|
|
86
88
|
private readonly concurrencyControl;
|
|
87
89
|
private readonly license;
|
|
88
|
-
constructor(logger: Logger, queue: Queue, activeExecutions: ActiveExecutions, executionRepository: ExecutionRepository, workflowRepository: WorkflowRepository, nodeTypes: NodeTypes, waitTracker: WaitTracker, workflowRunner: WorkflowRunner, concurrencyControl: ConcurrencyControlService, license: License);
|
|
90
|
+
constructor(globalConfig: GlobalConfig, logger: Logger, queue: Queue, activeExecutions: ActiveExecutions, executionRepository: ExecutionRepository, workflowRepository: WorkflowRepository, nodeTypes: NodeTypes, waitTracker: WaitTracker, workflowRunner: WorkflowRunner, concurrencyControl: ConcurrencyControlService, license: License);
|
|
89
91
|
findOne(req: ExecutionRequest.GetOne, sharedWorkflowIds: string[]): Promise<IExecutionResponse | IExecutionFlattedResponse | undefined>;
|
|
90
92
|
retry(req: ExecutionRequest.Retry, sharedWorkflowIds: string[]): Promise<boolean>;
|
|
91
93
|
delete(req: ExecutionRequest.Delete, sharedWorkflowIds: string[]): Promise<void>;
|
|
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.ExecutionService = exports.allowedExecutionsQueryFilterFields = exports.schemaGetExecutionsQueryFilter = void 0;
|
|
16
16
|
const typedi_1 = require("typedi");
|
|
17
|
+
const config_1 = require("@n8n/config");
|
|
17
18
|
const jsonschema_1 = require("jsonschema");
|
|
18
19
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
19
20
|
const ActiveExecutions_1 = require("../ActiveExecutions");
|
|
@@ -25,7 +26,7 @@ const workflow_repository_1 = require("../databases/repositories/workflow.reposi
|
|
|
25
26
|
const Logger_1 = require("../Logger");
|
|
26
27
|
const internal_server_error_1 = require("../errors/response-errors/internal-server.error");
|
|
27
28
|
const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
28
|
-
const
|
|
29
|
+
const config_2 = __importDefault(require("../config"));
|
|
29
30
|
const WaitTracker_1 = require("../WaitTracker");
|
|
30
31
|
const missing_execution_stop_error_1 = require("../errors/missing-execution-stop.error");
|
|
31
32
|
const queued_execution_retry_error_1 = require("../errors/queued-execution-retry.error");
|
|
@@ -66,7 +67,8 @@ exports.schemaGetExecutionsQueryFilter = {
|
|
|
66
67
|
};
|
|
67
68
|
exports.allowedExecutionsQueryFilterFields = Object.keys(exports.schemaGetExecutionsQueryFilter.properties);
|
|
68
69
|
let ExecutionService = class ExecutionService {
|
|
69
|
-
constructor(logger, queue, activeExecutions, executionRepository, workflowRepository, nodeTypes, waitTracker, workflowRunner, concurrencyControl, license) {
|
|
70
|
+
constructor(globalConfig, logger, queue, activeExecutions, executionRepository, workflowRepository, nodeTypes, waitTracker, workflowRunner, concurrencyControl, license) {
|
|
71
|
+
this.globalConfig = globalConfig;
|
|
70
72
|
this.logger = logger;
|
|
71
73
|
this.queue = queue;
|
|
72
74
|
this.activeExecutions = activeExecutions;
|
|
@@ -254,7 +256,7 @@ let ExecutionService = class ExecutionService {
|
|
|
254
256
|
}
|
|
255
257
|
async findRangeWithCount(query) {
|
|
256
258
|
const results = await this.executionRepository.findManyByRangeQuery(query);
|
|
257
|
-
if (
|
|
259
|
+
if (this.globalConfig.database.type === 'postgresdb') {
|
|
258
260
|
const liveRows = await this.executionRepository.getLiveExecutionRowsOnPostgres();
|
|
259
261
|
if (liveRows === -1)
|
|
260
262
|
return { count: -1, estimated: false, results };
|
|
@@ -302,7 +304,7 @@ let ExecutionService = class ExecutionService {
|
|
|
302
304
|
if (!execution)
|
|
303
305
|
throw new missing_execution_stop_error_1.MissingExecutionStopError(executionId);
|
|
304
306
|
this.assertStoppable(execution);
|
|
305
|
-
const { mode, startedAt, stoppedAt, finished, status } =
|
|
307
|
+
const { mode, startedAt, stoppedAt, finished, status } = config_2.default.getEnv('executions.mode') === 'regular'
|
|
306
308
|
? await this.stopInRegularMode(execution)
|
|
307
309
|
: await this.stopInScalingMode(execution);
|
|
308
310
|
return {
|
|
@@ -336,6 +338,9 @@ let ExecutionService = class ExecutionService {
|
|
|
336
338
|
if (execution.mode === 'manual') {
|
|
337
339
|
return await this.stopInRegularMode(execution);
|
|
338
340
|
}
|
|
341
|
+
if (this.activeExecutions.has(execution.id)) {
|
|
342
|
+
await this.activeExecutions.stopExecution(execution.id);
|
|
343
|
+
}
|
|
339
344
|
if (this.waitTracker.has(execution.id)) {
|
|
340
345
|
await this.waitTracker.stopExecution(execution.id);
|
|
341
346
|
}
|
|
@@ -352,7 +357,8 @@ let ExecutionService = class ExecutionService {
|
|
|
352
357
|
exports.ExecutionService = ExecutionService;
|
|
353
358
|
exports.ExecutionService = ExecutionService = __decorate([
|
|
354
359
|
(0, typedi_1.Service)(),
|
|
355
|
-
__metadata("design:paramtypes", [
|
|
360
|
+
__metadata("design:paramtypes", [config_1.GlobalConfig,
|
|
361
|
+
Logger_1.Logger,
|
|
356
362
|
Queue_1.Queue,
|
|
357
363
|
ActiveExecutions_1.ActiveExecutions,
|
|
358
364
|
execution_repository_1.ExecutionRepository,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.service.js","sourceRoot":"","sources":["../../src/executions/execution.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execution.service.js","sourceRoot":"","sources":["../../src/executions/execution.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,16 @@
|
|
|
1
|
-
import { EventEmitter } from 'events';
|
|
2
1
|
import type { IPushDataType } from '../Interfaces';
|
|
3
2
|
import type { Logger } from '../Logger';
|
|
4
|
-
|
|
5
|
-
import type { OrchestrationService } from '../services/orchestration.service';
|
|
6
|
-
export declare abstract class AbstractPush<T> extends EventEmitter {
|
|
3
|
+
export declare abstract class AbstractPush<T> {
|
|
7
4
|
protected readonly logger: Logger;
|
|
8
|
-
private readonly orchestrationService;
|
|
9
5
|
protected connections: Record<string, T>;
|
|
10
|
-
protected userIdByPushRef: Record<string, string>;
|
|
11
6
|
protected abstract close(connection: T): void;
|
|
12
7
|
protected abstract sendToOneConnection(connection: T, data: string): void;
|
|
13
|
-
constructor(logger: Logger
|
|
14
|
-
protected add(pushRef: string,
|
|
15
|
-
protected onMessageReceived(pushRef: string, msg: unknown): void;
|
|
8
|
+
constructor(logger: Logger);
|
|
9
|
+
protected add(pushRef: string, connection: T): void;
|
|
16
10
|
protected remove(pushRef?: string): void;
|
|
17
11
|
private sendTo;
|
|
18
12
|
sendToAll(type: IPushDataType, data?: unknown): void;
|
|
19
|
-
|
|
20
|
-
sendToUsers(type: IPushDataType, data: unknown, userIds: Array<User['id']>): void;
|
|
13
|
+
sendToOne(type: IPushDataType, data: unknown, pushRef: string): void;
|
|
21
14
|
closeAllConnections(): void;
|
|
22
15
|
hasPushRef(pushRef: string): boolean;
|
|
23
16
|
}
|
|
@@ -1,37 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AbstractPush = void 0;
|
|
4
|
-
const events_1 = require("events");
|
|
5
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
|
-
class AbstractPush
|
|
7
|
-
constructor(logger
|
|
8
|
-
super();
|
|
5
|
+
class AbstractPush {
|
|
6
|
+
constructor(logger) {
|
|
9
7
|
this.logger = logger;
|
|
10
|
-
this.orchestrationService = orchestrationService;
|
|
11
8
|
this.connections = {};
|
|
12
|
-
this.userIdByPushRef = {};
|
|
13
9
|
}
|
|
14
|
-
add(pushRef,
|
|
15
|
-
const { connections
|
|
10
|
+
add(pushRef, connection) {
|
|
11
|
+
const { connections } = this;
|
|
16
12
|
this.logger.debug('Add editor-UI session', { pushRef });
|
|
17
13
|
const existingConnection = connections[pushRef];
|
|
18
14
|
if (existingConnection) {
|
|
19
15
|
this.close(existingConnection);
|
|
20
16
|
}
|
|
21
17
|
connections[pushRef] = connection;
|
|
22
|
-
userIdByPushRef[pushRef] = userId;
|
|
23
|
-
}
|
|
24
|
-
onMessageReceived(pushRef, msg) {
|
|
25
|
-
this.logger.debug('Received message from editor-UI', { pushRef, msg });
|
|
26
|
-
const userId = this.userIdByPushRef[pushRef];
|
|
27
|
-
this.emit('message', { pushRef, userId, msg });
|
|
28
18
|
}
|
|
29
19
|
remove(pushRef) {
|
|
30
20
|
if (!pushRef)
|
|
31
21
|
return;
|
|
32
22
|
this.logger.debug('Removed editor-UI session', { pushRef });
|
|
33
23
|
delete this.connections[pushRef];
|
|
34
|
-
delete this.userIdByPushRef[pushRef];
|
|
35
24
|
}
|
|
36
25
|
sendTo(type, data, pushRefs) {
|
|
37
26
|
this.logger.debug(`Send data of type "${type}" to editor-UI`, {
|
|
@@ -48,23 +37,13 @@ class AbstractPush extends events_1.EventEmitter {
|
|
|
48
37
|
sendToAll(type, data) {
|
|
49
38
|
this.sendTo(type, data, Object.keys(this.connections));
|
|
50
39
|
}
|
|
51
|
-
|
|
52
|
-
if (this.orchestrationService.isMultiMainSetupEnabled && !this.hasPushRef(pushRef)) {
|
|
53
|
-
const payload = { type, args: data, pushRef };
|
|
54
|
-
void this.orchestrationService.publish('relay-execution-lifecycle-event', payload);
|
|
55
|
-
return;
|
|
56
|
-
}
|
|
40
|
+
sendToOne(type, data, pushRef) {
|
|
57
41
|
if (this.connections[pushRef] === undefined) {
|
|
58
42
|
this.logger.error(`The session "${pushRef}" is not registered.`, { pushRef });
|
|
59
43
|
return;
|
|
60
44
|
}
|
|
61
45
|
this.sendTo(type, data, [pushRef]);
|
|
62
46
|
}
|
|
63
|
-
sendToUsers(type, data, userIds) {
|
|
64
|
-
const { connections } = this;
|
|
65
|
-
const userPushRefs = Object.keys(connections).filter((pushRef) => userIds.includes(this.userIdByPushRef[pushRef]));
|
|
66
|
-
this.sendTo(type, data, userPushRefs);
|
|
67
|
-
}
|
|
68
47
|
closeAllConnections() {
|
|
69
48
|
for (const pushRef in this.connections) {
|
|
70
49
|
this.close(this.connections[pushRef]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract.push.js","sourceRoot":"","sources":["../../src/push/abstract.push.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"abstract.push.js","sourceRoot":"","sources":["../../src/push/abstract.push.ts"],"names":[],"mappings":";;;AAAA,+CAAqD;AAUrD,MAAsB,YAAY;IAMjC,YAA+B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QALnC,gBAAW,GAAsB,EAAE,CAAC;IAKE,CAAC;IAEvC,GAAG,CAAC,OAAe,EAAE,UAAa;QAC3C,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAExD,MAAM,kBAAkB,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QAEhD,IAAI,kBAAkB,EAAE,CAAC;YAExB,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAChC,CAAC;QAED,WAAW,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC;IACnC,CAAC;IAES,MAAM,CAAC,OAAgB;QAChC,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAE5D,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEO,MAAM,CAAC,IAAmB,EAAE,IAAa,EAAE,QAAkB;QACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,gBAAgB,EAAE;YAC7D,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;SAC7B,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,IAAA,4BAAa,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;QAExF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAA,qBAAM,EAAC,UAAU,CAAC,CAAC;YACnB,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC;IAED,SAAS,CAAC,IAAmB,EAAE,IAAc;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,SAAS,CAAC,IAAmB,EAAE,IAAa,EAAE,OAAe;QAC5D,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,EAAE,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,OAAO,sBAAsB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9E,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,mBAAmB;QAClB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAKxC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;IAED,UAAU,CAAC,OAAe;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC;IAChD,CAAC;CACD;AAvED,oCAuEC"}
|