n8n 1.0.4 → 1.0.5

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.
Files changed (27) hide show
  1. package/dist/AbstractServer.js +37 -20
  2. package/dist/AbstractServer.js.map +1 -1
  3. package/dist/GenericHelpers.d.ts +5 -0
  4. package/dist/GenericHelpers.js +25 -1
  5. package/dist/GenericHelpers.js.map +1 -1
  6. package/dist/Queue.d.ts +1 -1
  7. package/dist/Queue.js +33 -3
  8. package/dist/Queue.js.map +1 -1
  9. package/dist/build.tsbuildinfo +1 -1
  10. package/dist/config/index.d.ts +1 -0
  11. package/dist/config/schema.d.ts +6 -0
  12. package/dist/config/schema.js +8 -2
  13. package/dist/config/schema.js.map +1 -1
  14. package/dist/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.d.ts +4 -0
  15. package/dist/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.js +24 -0
  16. package/dist/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.js.map +1 -0
  17. package/dist/databases/migrations/sqlite/index.js +2 -0
  18. package/dist/databases/migrations/sqlite/index.js.map +1 -1
  19. package/dist/decorators/registerController.d.ts +1 -0
  20. package/dist/sso/saml/routes/saml.controller.ee.js +22 -4
  21. package/dist/sso/saml/routes/saml.controller.ee.js.map +1 -1
  22. package/dist/sso/saml/saml.service.ee.js +2 -3
  23. package/dist/sso/saml/saml.service.ee.js.map +1 -1
  24. package/dist/sso/saml/samlHelpers.js +3 -1
  25. package/dist/sso/saml/samlHelpers.js.map +1 -1
  26. package/oclif.manifest.json +1 -1
  27. package/package.json +3 -3
package/dist/AbstractServer.js CHANGED
@@ -45,6 +45,7 @@ const middlewares_1 = require("./middlewares");
45
45
  const TestWebhooks_1 = require("./TestWebhooks");
46
46
  const WaitingWebhooks_1 = require("./WaitingWebhooks");
47
47
  const WebhookHelpers_1 = require("./WebhookHelpers");
48
+ const GenericHelpers_1 = require("./GenericHelpers");
48
49
  const emptyBuffer = Buffer.alloc(0);
49
50
  class AbstractServer {
50
51
  constructor() {
@@ -137,30 +138,46 @@ class AbstractServer {
137
138
  let lastTimer = 0;
138
139
  let cumulativeTimeout = 0;
139
140
  const { host, port, username, password, db } = config_1.default.getEnv('queue.bull.redis');
141
+ const clusterNodes = (0, GenericHelpers_1.getRedisClusterNodes)();
140
142
  const redisConnectionTimeoutLimit = config_1.default.getEnv('queue.bull.redis.timeoutThreshold');
141
- const redis = new Redis({
142
- host,
143
- port,
144
- db,
143
+ const usesRedisCluster = clusterNodes.length > 0;
144
+ n8n_workflow_1.LoggerProxy.debug(usesRedisCluster
145
+ ? `Initialising Redis cluster connection with nodes: ${clusterNodes
146
+ .map((e) => `${e.host}:${e.port}`)
147
+ .join(',')}`
148
+ : `Initialising Redis client connection with host: ${host !== null && host !== void 0 ? host : 'localhost'} and port: ${port !== null && port !== void 0 ? port : '6379'}`);
149
+ const sharedRedisOptions = {
145
150
  username,
146
151
  password,
147
- retryStrategy: () => {
148
- const now = Date.now();
149
- if (now - lastTimer > 30000) {
150
- lastTimer = now;
151
- cumulativeTimeout = 0;
152
- }
153
- else {
154
- cumulativeTimeout += now - lastTimer;
155
- lastTimer = now;
156
- if (cumulativeTimeout > redisConnectionTimeoutLimit) {
157
- n8n_workflow_1.LoggerProxy.error(`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`);
158
- process.exit(1);
152
+ db,
153
+ enableReadyCheck: false,
154
+ maxRetriesPerRequest: null,
155
+ };
156
+ const redis = usesRedisCluster
157
+ ? new Redis.Cluster(clusterNodes.map((node) => ({ host: node.host, port: node.port })), {
158
+ redisOptions: sharedRedisOptions,
159
+ })
160
+ : new Redis({
161
+ host,
162
+ port,
163
+ ...sharedRedisOptions,
164
+ retryStrategy: () => {
165
+ const now = Date.now();
166
+ if (now - lastTimer > 30000) {
167
+ lastTimer = now;
168
+ cumulativeTimeout = 0;
159
169
  }
160
- }
161
- return 500;
162
- },
163
- });
170
+ else {
171
+ cumulativeTimeout += now - lastTimer;
172
+ lastTimer = now;
173
+ if (cumulativeTimeout > redisConnectionTimeoutLimit) {
174
+ n8n_workflow_1.LoggerProxy.error(`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`);
175
+ process.exit(1);
176
+ }
177
+ }
178
+ return 500;
179
+ },
180
+ });
164
181
  redis.on('close', () => {
165
182
  n8n_workflow_1.LoggerProxy.warn('Redis unavailable - trying to reconnect...');
166
183
  });
package/dist/AbstractServer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractServer.js","sourceRoot":"","sources":["../src/AbstractServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AbstractServer.js","sourceRoot":"","sources":["../src/AbstractServer.ts"],"names":[],"mappings":"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"}
package/dist/GenericHelpers.d.ts CHANGED
@@ -11,4 +11,9 @@ export declare function getSessionId(req: express.Request): string | undefined;
11
11
  export declare function generateUniqueName(requestedName: string, entityType: 'workflow' | 'credentials'): Promise<string>;
12
12
  export declare function validateEntity(entity: WorkflowEntity | CredentialsEntity | TagEntity | User | UserUpdatePayload): Promise<void>;
13
13
  export declare function createErrorExecution(error: ExecutionError, node: INode, workflowData: IWorkflowDb, workflow: Workflow, mode: WorkflowExecuteMode): Promise<void>;
14
+ export declare function getRedisClusterNodes(): Array<{
15
+ host: string;
16
+ port: number;
17
+ }>;
18
+ export declare function getRedisPrefix(): string;
14
19
  export declare const DEFAULT_EXECUTIONS_GET_ALL_LIMIT = 20;
package/dist/GenericHelpers.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.DEFAULT_EXECUTIONS_GET_ALL_LIMIT = exports.createErrorExecution = exports.validateEntity = exports.generateUniqueName = exports.getSessionId = exports.getBaseUrl = void 0;
29
+ exports.DEFAULT_EXECUTIONS_GET_ALL_LIMIT = exports.getRedisPrefix = exports.getRedisClusterNodes = exports.createErrorExecution = exports.validateEntity = exports.generateUniqueName = exports.getSessionId = exports.getBaseUrl = void 0;
30
30
  const class_validator_1 = require("class-validator");
31
31
  const typeorm_1 = require("typeorm");
32
32
  const config_1 = __importDefault(require("./config"));
@@ -154,5 +154,29 @@ async function createErrorExecution(error, node, workflowData, workflow, mode) {
154
154
  await typedi_1.default.get(repositories_1.ExecutionRepository).createNewExecution(fullExecutionData);
155
155
  }
156
156
  exports.createErrorExecution = createErrorExecution;
157
+ function getRedisClusterNodes() {
158
+ const clusterNodePairs = config_1.default
159
+ .getEnv('queue.bull.redis.clusterNodes')
160
+ .split(',')
161
+ .filter((e) => e);
162
+ return clusterNodePairs.map((pair) => {
163
+ const [host, port] = pair.split(':');
164
+ return { host, port: parseInt(port) };
165
+ });
166
+ }
167
+ exports.getRedisClusterNodes = getRedisClusterNodes;
168
+ function getRedisPrefix() {
169
+ let prefix = config_1.default.getEnv('queue.bull.prefix');
170
+ if (prefix && getRedisClusterNodes().length > 0) {
171
+ if (!prefix.startsWith('{')) {
172
+ prefix = '{' + prefix;
173
+ }
174
+ if (!prefix.endsWith('}')) {
175
+ prefix += '}';
176
+ }
177
+ }
178
+ return prefix;
179
+ }
180
+ exports.getRedisPrefix = getRedisPrefix;
157
181
  exports.DEFAULT_EXECUTIONS_GET_ALL_LIMIT = 20;
158
182
  //# sourceMappingURL=GenericHelpers.js.map
package/dist/GenericHelpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GenericHelpers.js","sourceRoot":"","sources":["../src/GenericHelpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GenericHelpers.js","sourceRoot":"","sources":["../src/GenericHelpers.ts"],"names":[],"mappings":"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"}
package/dist/Queue.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type Bull from 'bull';
2
- import type { IExecuteResponsePromiseData } from 'n8n-workflow';
2
+ import { type IExecuteResponsePromiseData } from 'n8n-workflow';
3
3
  import { ActiveExecutions } from './ActiveExecutions';
4
4
  export type JobId = Bull.JobId;
5
5
  export type Job = Bull.Job<JobData>;
package/dist/Queue.js CHANGED
@@ -37,18 +37,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
37
37
  Object.defineProperty(exports, "__esModule", { value: true });
38
38
  exports.Queue = void 0;
39
39
  const typedi_1 = require("typedi");
40
+ const n8n_workflow_1 = require("n8n-workflow");
40
41
  const config_1 = __importDefault(require("./config"));
41
42
  const ActiveExecutions_1 = require("./ActiveExecutions");
42
43
  const WebhookHelpers = __importStar(require("./WebhookHelpers"));
44
+ const GenericHelpers_1 = require("./GenericHelpers");
43
45
  let Queue = exports.Queue = class Queue {
44
46
  constructor(activeExecutions) {
45
47
  this.activeExecutions = activeExecutions;
46
48
  }
47
49
  async init() {
48
- const prefix = config_1.default.getEnv('queue.bull.prefix');
49
- const redisOptions = config_1.default.getEnv('queue.bull.redis');
50
+ const prefix = (0, GenericHelpers_1.getRedisPrefix)();
51
+ const clusterNodes = (0, GenericHelpers_1.getRedisClusterNodes)();
52
+ const usesRedisCluster = clusterNodes.length > 0;
53
+ const { host, port, username, password, db } = config_1.default.getEnv('queue.bull.redis');
50
54
  const { default: Bull } = await Promise.resolve().then(() => __importStar(require('bull')));
51
- this.jobQueue = new Bull('jobs', { prefix, redis: redisOptions, enableReadyCheck: false });
55
+ const { default: Redis } = await Promise.resolve().then(() => __importStar(require('ioredis')));
56
+ n8n_workflow_1.LoggerProxy.debug(usesRedisCluster
57
+ ? `Initialising Redis cluster connection with nodes: ${clusterNodes
58
+ .map((e) => `${e.host}:${e.port}`)
59
+ .join(',')}`
60
+ : `Initialising Redis client connection with host: ${host !== null && host !== void 0 ? host : 'localhost'} and port: ${port !== null && port !== void 0 ? port : '6379'}`);
61
+ const sharedRedisOptions = {
62
+ username,
63
+ password,
64
+ db,
65
+ enableReadyCheck: false,
66
+ maxRetriesPerRequest: null,
67
+ };
68
+ this.jobQueue = new Bull('jobs', {
69
+ prefix,
70
+ createClient: (type, clientConfig) => usesRedisCluster
71
+ ? new Redis.Cluster(clusterNodes.map((node) => ({ host: node.host, port: node.port })), {
72
+ ...clientConfig,
73
+ redisOptions: sharedRedisOptions,
74
+ })
75
+ : new Redis({
76
+ ...clientConfig,
77
+ host,
78
+ port,
79
+ ...sharedRedisOptions,
80
+ }),
81
+ });
52
82
  this.jobQueue.on('global:progress', (jobId, progress) => {
53
83
  this.activeExecutions.resolveResponsePromise(progress.executionId, WebhookHelpers.decodeWebhookResponse(progress.response));
54
84
  });
package/dist/Queue.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Queue.js","sourceRoot":"","sources":["../src/Queue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,mCAAiC;AAEjC,sDAA8B;AAC9B,yDAAsD;AACtD,iEAAmD;AAqB5C,IAAM,KAAK,mBAAX,MAAM,KAAK;IAGjB,YAAoB,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAE1D,KAAK,CAAC,IAAI;QACT,MAAM,MAAM,GAAG,gBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAClD,MAAM,YAAY,GAAiB,gBAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAGrE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,wDAAa,MAAM,GAAC,CAAC;QAQ/C,IAAI,CAAC,QAAQ,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;QAE3F,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,QAAyB,EAAE,EAAE;YACxE,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAE3C,QAAQ,CAAC,WAAW,EACpB,cAAc,CAAC,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACvD,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAgB,EAAE,UAAkB;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAY;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAA0B;QACvC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,qBAAqB;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAOD,KAAK,CAAC,OAAO,CAAC,GAAQ;QACrB,IAAI,MAAM,GAAG,CAAC,QAAQ,EAAE,EAAE;YAEzB,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACvB,OAAO,IAAI,CAAC;SACZ;QAED,IAAI;YACH,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC;SACZ;QAAC,OAAO,CAAC,EAAE;YACX,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;SACvB;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD,CAAA;gBAlEY,KAAK;IADjB,IAAA,gBAAO,GAAE;qCAI6B,mCAAgB;GAH1C,KAAK,CAkEjB"}
1
+ {"version":3,"file":"Queue.js","sourceRoot":"","sources":["../src/Queue.ts"],"names":[],"mappings":"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"}