n8n 1.40.0 → 1.41.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/AbstractServer.js +4 -4
- package/dist/AbstractServer.js.map +1 -1
- package/dist/{ActiveWorkflowRunner.d.ts → ActiveWorkflowManager.d.ts} +1 -1
- package/dist/{ActiveWorkflowRunner.js → ActiveWorkflowManager.js} +7 -7
- package/dist/ActiveWorkflowManager.js.map +1 -0
- package/dist/CredentialsHelper.js +3 -0
- package/dist/CredentialsHelper.js.map +1 -1
- package/dist/Interfaces.d.ts +2 -2
- package/dist/License.d.ts +2 -0
- package/dist/License.js +18 -4
- package/dist/License.js.map +1 -1
- package/dist/NodeTypes.d.ts +1 -0
- package/dist/NodeTypes.js +3 -0
- package/dist/NodeTypes.js.map +1 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js +7 -7
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/ResponseHelper.js +4 -2
- package/dist/ResponseHelper.js.map +1 -1
- package/dist/WebhookHelpers.js +9 -13
- package/dist/WebhookHelpers.js.map +1 -1
- package/dist/WorkflowExecuteAdditionalData.js +1 -1
- package/dist/WorkflowExecuteAdditionalData.js.map +1 -1
- package/dist/WorkflowRunner.js +3 -3
- package/dist/WorkflowRunner.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/BaseCommand.d.ts +2 -0
- package/dist/commands/BaseCommand.js +5 -5
- package/dist/commands/BaseCommand.js.map +1 -1
- package/dist/commands/executeBatch.js +17 -17
- package/dist/commands/executeBatch.js.map +1 -1
- package/dist/commands/start.d.ts +2 -2
- package/dist/commands/start.js +12 -9
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/update/workflow.js +4 -4
- package/dist/commands/update/workflow.js.map +1 -1
- package/dist/controllers/binaryData.controller.d.ts +1 -1
- package/dist/controllers/debug.controller.d.ts +3 -3
- package/dist/controllers/debug.controller.js +6 -6
- package/dist/controllers/debug.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +3 -3
- package/dist/controllers/users.controller.js +5 -5
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.d.ts +1 -1
- package/dist/environments/sourceControl/sourceControlImport.service.ee.d.ts +3 -3
- package/dist/environments/sourceControl/sourceControlImport.service.ee.js +5 -5
- package/dist/environments/sourceControl/sourceControlImport.service.ee.js.map +1 -1
- package/dist/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.js +3 -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/help.js +6 -1
- package/dist/help.js.map +1 -1
- package/dist/security-audit/risk-reporters/InstanceRiskReporter.d.ts +3 -1
- package/dist/security-audit/risk-reporters/InstanceRiskReporter.js +6 -3
- package/dist/security-audit/risk-reporters/InstanceRiskReporter.js.map +1 -1
- package/dist/services/credentials-tester.service.js +3 -0
- package/dist/services/credentials-tester.service.js.map +1 -1
- package/dist/services/orchestration/main/MultiMainSetup.ee.js.map +1 -1
- package/dist/services/orchestration/main/handleCommandMessageMain.js +5 -5
- package/dist/services/orchestration/main/handleCommandMessageMain.js.map +1 -1
- package/dist/sso/saml/saml.service.ee.js +1 -1
- package/dist/sso/saml/saml.service.ee.js.map +1 -1
- package/dist/workflows/workflow.service.d.ts +4 -4
- package/dist/workflows/workflow.service.js +7 -7
- package/dist/workflows/workflow.service.js.map +1 -1
- package/package.json +6 -6
- package/dist/ActiveWorkflowRunner.js.map +0 -1
package/dist/AbstractServer.js
CHANGED
|
@@ -131,14 +131,14 @@ let AbstractServer = class AbstractServer {
|
|
|
131
131
|
const ADDRESS = config_1.default.getEnv('listen_address');
|
|
132
132
|
this.server.on('error', (error) => {
|
|
133
133
|
if (error.code === 'EADDRINUSE') {
|
|
134
|
-
|
|
134
|
+
this.logger.info(`n8n's port ${PORT} is already in use. Do you have another instance of n8n running already?`);
|
|
135
135
|
process.exit(1);
|
|
136
136
|
}
|
|
137
137
|
});
|
|
138
138
|
await new Promise((resolve) => this.server.listen(PORT, ADDRESS, () => resolve()));
|
|
139
139
|
this.externalHooks = typedi_1.Container.get(ExternalHooks_1.ExternalHooks);
|
|
140
140
|
await this.setupHealthCheck();
|
|
141
|
-
|
|
141
|
+
this.logger.info(`n8n ready on ${ADDRESS}, port ${PORT}`);
|
|
142
142
|
}
|
|
143
143
|
async start() {
|
|
144
144
|
if (!constants_1.inTest) {
|
|
@@ -175,10 +175,10 @@ let AbstractServer = class AbstractServer {
|
|
|
175
175
|
this.app.use(middlewares_1.bodyParser);
|
|
176
176
|
await this.configure();
|
|
177
177
|
if (!constants_1.inTest) {
|
|
178
|
-
|
|
178
|
+
this.logger.info(`Version: ${constants_1.N8N_VERSION}`);
|
|
179
179
|
const defaultLocale = config_1.default.getEnv('defaultLocale');
|
|
180
180
|
if (defaultLocale !== 'en') {
|
|
181
|
-
|
|
181
|
+
this.logger.info(`Locale: ${defaultLocale}`);
|
|
182
182
|
}
|
|
183
183
|
await this.externalHooks.run('n8n.ready', [this, config_1.default]);
|
|
184
184
|
}
|
|
@@ -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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"}
|
|
@@ -15,7 +15,7 @@ import { ActivationErrorsService } from './ActivationErrors.service';
|
|
|
15
15
|
import { ActiveWorkflowsService } from './services/activeWorkflows.service';
|
|
16
16
|
import { WorkflowExecutionService } from './workflows/workflowExecution.service';
|
|
17
17
|
import { WorkflowStaticDataService } from './workflows/workflowStaticData.service';
|
|
18
|
-
export declare class
|
|
18
|
+
export declare class ActiveWorkflowManager {
|
|
19
19
|
private readonly logger;
|
|
20
20
|
private readonly activeWorkflows;
|
|
21
21
|
private readonly activeExecutions;
|
|
@@ -32,7 +32,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
32
32
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.
|
|
35
|
+
exports.ActiveWorkflowManager = void 0;
|
|
36
36
|
const typedi_1 = require("typedi");
|
|
37
37
|
const n8n_core_1 = require("n8n-core");
|
|
38
38
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
@@ -52,7 +52,7 @@ const activeWorkflows_service_1 = require("./services/activeWorkflows.service");
|
|
|
52
52
|
const workflowExecution_service_1 = require("./workflows/workflowExecution.service");
|
|
53
53
|
const workflowStaticData_service_1 = require("./workflows/workflowStaticData.service");
|
|
54
54
|
const OnShutdown_1 = require("./decorators/OnShutdown");
|
|
55
|
-
let
|
|
55
|
+
let ActiveWorkflowManager = class ActiveWorkflowManager {
|
|
56
56
|
constructor(logger, activeWorkflows, activeExecutions, externalHooks, nodeTypes, webhookService, workflowRepository, orchestrationService, activationErrorsService, executionService, workflowStaticDataService, activeWorkflowsService, workflowExecutionService) {
|
|
57
57
|
this.logger = logger;
|
|
58
58
|
this.activeWorkflows = activeWorkflows;
|
|
@@ -482,14 +482,14 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
|
|
|
482
482
|
await this.activationErrorsService.deregister(workflowId);
|
|
483
483
|
}
|
|
484
484
|
};
|
|
485
|
-
exports.
|
|
485
|
+
exports.ActiveWorkflowManager = ActiveWorkflowManager;
|
|
486
486
|
__decorate([
|
|
487
487
|
(0, OnShutdown_1.OnShutdown)(),
|
|
488
488
|
__metadata("design:type", Function),
|
|
489
489
|
__metadata("design:paramtypes", []),
|
|
490
490
|
__metadata("design:returntype", Promise)
|
|
491
|
-
],
|
|
492
|
-
exports.
|
|
491
|
+
], ActiveWorkflowManager.prototype, "removeAllTriggerAndPollerBasedWorkflows", null);
|
|
492
|
+
exports.ActiveWorkflowManager = ActiveWorkflowManager = __decorate([
|
|
493
493
|
(0, typedi_1.Service)(),
|
|
494
494
|
__metadata("design:paramtypes", [Logger_1.Logger,
|
|
495
495
|
n8n_core_1.ActiveWorkflows,
|
|
@@ -504,5 +504,5 @@ exports.ActiveWorkflowRunner = ActiveWorkflowRunner = __decorate([
|
|
|
504
504
|
workflowStaticData_service_1.WorkflowStaticDataService,
|
|
505
505
|
activeWorkflows_service_1.ActiveWorkflowsService,
|
|
506
506
|
workflowExecution_service_1.WorkflowExecutionService])
|
|
507
|
-
],
|
|
508
|
-
//# sourceMappingURL=
|
|
507
|
+
], ActiveWorkflowManager);
|
|
508
|
+
//# sourceMappingURL=ActiveWorkflowManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ActiveWorkflowManager.js","sourceRoot":"","sources":["../src/ActiveWorkflowManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CredentialsHelper.js","sourceRoot":"","sources":["../src/CredentialsHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,mCAAiC;AACjC,uCAA6D;
|
|
1
|
+
{"version":3,"file":"CredentialsHelper.js","sourceRoot":"","sources":["../src/CredentialsHelper.ts"],"names":[],"mappings":"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"}
|
package/dist/Interfaces.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { Application, Request, Response } from 'express';
|
|
3
3
|
import type { ExecutionError, ICredentialDataDecryptedObject, ICredentialsDecrypted, ICredentialsEncrypted, IDataObject, IDeferredPromise, IExecuteResponsePromiseData, IPinData, IRun, IRunData, IRunExecutionData, ITaskData, ITelemetryTrackProperties, IWorkflowBase, CredentialLoadingDetails, Workflow, WorkflowExecuteMode, ExecutionStatus, ExecutionSummary, FeatureFlags, INodeProperties, IUserSettings, IHttpRequestMethods, StartNodeData } from 'n8n-workflow';
|
|
4
|
-
import type {
|
|
4
|
+
import type { ActiveWorkflowManager } from './ActiveWorkflowManager';
|
|
5
5
|
import type { WorkflowExecute } from 'n8n-core';
|
|
6
6
|
import type PCancelable from 'p-cancelable';
|
|
7
7
|
import type { AuthProviderType } from './databases/entities/AuthIdentity';
|
|
@@ -479,7 +479,7 @@ export interface N8nApp {
|
|
|
479
479
|
app: Application;
|
|
480
480
|
restEndpoint: string;
|
|
481
481
|
externalHooks: ExternalHooks;
|
|
482
|
-
|
|
482
|
+
activeWorkflowManager: ActiveWorkflowManager;
|
|
483
483
|
}
|
|
484
484
|
export type UserSettings = Pick<User, 'id' | 'settings'>;
|
|
485
485
|
export interface SecretsProviderSettings<T = IDataObject> {
|
package/dist/License.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ export declare class License {
|
|
|
22
22
|
private redisPublisher;
|
|
23
23
|
private isShuttingDown;
|
|
24
24
|
constructor(logger: Logger, instanceSettings: InstanceSettings, orchestrationService: OrchestrationService, settingsRepository: SettingsRepository, usageMetricsService: UsageMetricsService);
|
|
25
|
+
private renewalEnabled;
|
|
25
26
|
init(instanceType?: N8nInstanceType): Promise<void>;
|
|
26
27
|
loadCertStr(): Promise<TLicenseBlock>;
|
|
27
28
|
onFeatureChange(_features: TFeatures): Promise<void>;
|
|
@@ -57,5 +58,6 @@ export declare class License {
|
|
|
57
58
|
getPlanName(): string;
|
|
58
59
|
getInfo(): string;
|
|
59
60
|
isWithinUsersLimit(): boolean;
|
|
61
|
+
reinit(): Promise<void>;
|
|
60
62
|
}
|
|
61
63
|
export {};
|
package/dist/License.js
CHANGED
|
@@ -56,6 +56,15 @@ let License = class License {
|
|
|
56
56
|
this.usageMetricsService = usageMetricsService;
|
|
57
57
|
this.isShuttingDown = false;
|
|
58
58
|
}
|
|
59
|
+
renewalEnabled(instanceType) {
|
|
60
|
+
if (instanceType !== 'main')
|
|
61
|
+
return false;
|
|
62
|
+
const autoRenewEnabled = config_1.default.getEnv('license.autoRenewEnabled');
|
|
63
|
+
if (config_1.default.getEnv('multiMainSetup.enabled')) {
|
|
64
|
+
return autoRenewEnabled && config_1.default.getEnv('multiMainSetup.instanceType') === 'leader';
|
|
65
|
+
}
|
|
66
|
+
return autoRenewEnabled;
|
|
67
|
+
}
|
|
59
68
|
async init(instanceType = 'main') {
|
|
60
69
|
if (this.manager) {
|
|
61
70
|
this.logger.warn('License manager already initialized or shutting down');
|
|
@@ -67,7 +76,6 @@ let License = class License {
|
|
|
67
76
|
}
|
|
68
77
|
const isMainInstance = instanceType === 'main';
|
|
69
78
|
const server = config_1.default.getEnv('license.serverUrl');
|
|
70
|
-
const autoRenewEnabled = isMainInstance && config_1.default.getEnv('license.autoRenewEnabled');
|
|
71
79
|
const offlineMode = !isMainInstance;
|
|
72
80
|
const autoRenewOffset = config_1.default.getEnv('license.autoRenewOffset');
|
|
73
81
|
const saveCertStr = isMainInstance
|
|
@@ -79,13 +87,14 @@ let License = class License {
|
|
|
79
87
|
const collectUsageMetrics = isMainInstance
|
|
80
88
|
? async () => await this.usageMetricsService.collectUsageMetrics()
|
|
81
89
|
: async () => [];
|
|
90
|
+
const renewalEnabled = this.renewalEnabled(instanceType);
|
|
82
91
|
try {
|
|
83
92
|
this.manager = new license_sdk_1.LicenseManager({
|
|
84
93
|
server,
|
|
85
94
|
tenantId: config_1.default.getEnv('license.tenantId'),
|
|
86
95
|
productIdentifier: `n8n-${constants_1.N8N_VERSION}`,
|
|
87
|
-
autoRenewEnabled,
|
|
88
|
-
renewOnInit:
|
|
96
|
+
autoRenewEnabled: renewalEnabled,
|
|
97
|
+
renewOnInit: renewalEnabled,
|
|
89
98
|
autoRenewOffset,
|
|
90
99
|
offlineMode,
|
|
91
100
|
logger: this.logger,
|
|
@@ -126,7 +135,7 @@ let License = class License {
|
|
|
126
135
|
return;
|
|
127
136
|
}
|
|
128
137
|
if (this.orchestrationService.isMultiMainSetupEnabled && !isMultiMainLicensed) {
|
|
129
|
-
this.logger.debug('[Multi-main setup] License changed with no support for multi-main setup - no new followers will be allowed to init. To restore multi-main setup, please upgrade to a license that
|
|
138
|
+
this.logger.debug('[Multi-main setup] License changed with no support for multi-main setup - no new followers will be allowed to init. To restore multi-main setup, please upgrade to a license that supports this feature.');
|
|
130
139
|
}
|
|
131
140
|
}
|
|
132
141
|
if (config_1.default.getEnv('executions.mode') === 'queue') {
|
|
@@ -283,6 +292,11 @@ let License = class License {
|
|
|
283
292
|
isWithinUsersLimit() {
|
|
284
293
|
return this.getUsersLimit() === constants_1.UNLIMITED_LICENSE_QUOTA;
|
|
285
294
|
}
|
|
295
|
+
async reinit() {
|
|
296
|
+
var _a;
|
|
297
|
+
(_a = this.manager) === null || _a === void 0 ? void 0 : _a.reset();
|
|
298
|
+
await this.init();
|
|
299
|
+
}
|
|
286
300
|
};
|
|
287
301
|
exports.License = License;
|
|
288
302
|
__decorate([
|
package/dist/License.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"License.js","sourceRoot":"","sources":["../src/License.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qDAAqD;AACrD,uCAAgE;AAChE,iDAA4C;AAC5C,qCAAkC;AAClC,sDAA8B;AAC9B,2CAMqB;AACrB,8EAA0E;AAG1E,4DAAwD;AACxD,4EAAwE;AACxE,wDAAqD;AACrD,0EAAsE;AAS/D,IAAM,OAAO,GAAb,MAAM,OAAO;IAOnB,YACkB,MAAc,EACd,gBAAkC,EAClC,oBAA0C,EAC1C,kBAAsC,EACtC,mBAAwC;QAJxC,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,wBAAmB,GAAnB,mBAAmB,CAAqB;QAPlD,mBAAc,GAAG,KAAK,CAAC;IAQ5B,CAAC;
|
|
1
|
+
{"version":3,"file":"License.js","sourceRoot":"","sources":["../src/License.ts"],"names":[],"mappings":"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"}
|
package/dist/NodeTypes.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export declare class NodeTypes implements INodeTypes {
|
|
|
11
11
|
getByName(nodeType: string): INodeType | IVersionedNodeType;
|
|
12
12
|
getByNameAndVersion(nodeType: string, version?: number): INodeType;
|
|
13
13
|
applySpecialNodeParameters(): void;
|
|
14
|
+
getKnownTypes(): Record<string, import("n8n-workflow").LoadingDetails>;
|
|
14
15
|
private getNode;
|
|
15
16
|
getNodeTranslationPath({ nodeSourcePath, longNodeType, locale, }: {
|
|
16
17
|
nodeSourcePath: string;
|
package/dist/NodeTypes.js
CHANGED
|
@@ -42,6 +42,9 @@ let NodeTypes = class NodeTypes {
|
|
|
42
42
|
n8n_workflow_1.NodeHelpers.applySpecialNodeParameters(nodeType);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
+
getKnownTypes() {
|
|
46
|
+
return this.loadNodesAndCredentials.knownNodes;
|
|
47
|
+
}
|
|
45
48
|
getNode(type) {
|
|
46
49
|
const { loadedNodes, knownNodes } = this.loadNodesAndCredentials;
|
|
47
50
|
if (type in loadedNodes) {
|
package/dist/NodeTypes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeTypes.js","sourceRoot":"","sources":["../src/NodeTypes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NodeTypes.js","sourceRoot":"","sources":["../src/NodeTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
const typedi_1 = require("typedi");
|
|
6
6
|
const typeorm_1 = require("@n8n/typeorm");
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
|
-
const
|
|
8
|
+
const ActiveWorkflowManager_1 = require("../../../../ActiveWorkflowManager");
|
|
9
9
|
const config_1 = __importDefault(require("../../../../config"));
|
|
10
10
|
const WorkflowEntity_1 = require("../../../../databases/entities/WorkflowEntity");
|
|
11
11
|
const ExternalHooks_1 = require("../../../../ExternalHooks");
|
|
@@ -125,9 +125,9 @@ module.exports = {
|
|
|
125
125
|
}
|
|
126
126
|
await (0, WorkflowHelpers_1.replaceInvalidCredentials)(updateData);
|
|
127
127
|
(0, WorkflowHelpers_1.addNodeIds)(updateData);
|
|
128
|
-
const
|
|
128
|
+
const workflowManager = typedi_1.Container.get(ActiveWorkflowManager_1.ActiveWorkflowManager);
|
|
129
129
|
if (sharedWorkflow.workflow.active) {
|
|
130
|
-
await
|
|
130
|
+
await workflowManager.remove(id);
|
|
131
131
|
}
|
|
132
132
|
try {
|
|
133
133
|
await (0, workflows_service_1.updateWorkflow)(sharedWorkflow.workflowId, updateData);
|
|
@@ -139,7 +139,7 @@ module.exports = {
|
|
|
139
139
|
}
|
|
140
140
|
if (sharedWorkflow.workflow.active) {
|
|
141
141
|
try {
|
|
142
|
-
await
|
|
142
|
+
await workflowManager.add(sharedWorkflow.workflowId, 'update');
|
|
143
143
|
}
|
|
144
144
|
catch (error) {
|
|
145
145
|
if (error instanceof Error) {
|
|
@@ -166,7 +166,7 @@ module.exports = {
|
|
|
166
166
|
}
|
|
167
167
|
if (!sharedWorkflow.workflow.active) {
|
|
168
168
|
try {
|
|
169
|
-
await typedi_1.Container.get(
|
|
169
|
+
await typedi_1.Container.get(ActiveWorkflowManager_1.ActiveWorkflowManager).add(sharedWorkflow.workflowId, 'activate');
|
|
170
170
|
}
|
|
171
171
|
catch (error) {
|
|
172
172
|
if (error instanceof Error) {
|
|
@@ -188,9 +188,9 @@ module.exports = {
|
|
|
188
188
|
if (!sharedWorkflow) {
|
|
189
189
|
return res.status(404).json({ message: 'Not Found' });
|
|
190
190
|
}
|
|
191
|
-
const
|
|
191
|
+
const activeWorkflowManager = typedi_1.Container.get(ActiveWorkflowManager_1.ActiveWorkflowManager);
|
|
192
192
|
if (sharedWorkflow.workflow.active) {
|
|
193
|
-
await
|
|
193
|
+
await activeWorkflowManager.remove(sharedWorkflow.workflowId);
|
|
194
194
|
await (0, workflows_service_1.setWorkflowAsInactive)(sharedWorkflow.workflow);
|
|
195
195
|
sharedWorkflow.workflow.active = false;
|
|
196
196
|
return res.json(sharedWorkflow.workflow);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflows.handler.js","sourceRoot":"","sources":["../../../../../src/PublicApi/v1/handlers/workflows/workflows.handler.ts"],"names":[],"mappings":";;;;AAEA,mCAAmC;AAEnC,0CAA0D;AAC1D,+BAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"workflows.handler.js","sourceRoot":"","sources":["../../../../../src/PublicApi/v1/handlers/workflows/workflows.handler.ts"],"names":[],"mappings":"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"}
|
package/dist/ResponseHelper.js
CHANGED
|
@@ -9,6 +9,8 @@ const n8n_workflow_1 = require("n8n-workflow");
|
|
|
9
9
|
const node_stream_1 = require("node:stream");
|
|
10
10
|
const constants_1 = require("./constants");
|
|
11
11
|
const response_error_1 = require("./errors/response-errors/abstract/response.error");
|
|
12
|
+
const typedi_1 = __importDefault(require("typedi"));
|
|
13
|
+
const Logger_1 = require("./Logger");
|
|
12
14
|
function sendSuccessResponse(res, data, raw, responseCode, responseHeader) {
|
|
13
15
|
if (responseCode !== undefined) {
|
|
14
16
|
res.status(responseCode);
|
|
@@ -56,7 +58,7 @@ function sendErrorResponse(res, error) {
|
|
|
56
58
|
};
|
|
57
59
|
if (isResponseError(error)) {
|
|
58
60
|
if (constants_1.inDevelopment) {
|
|
59
|
-
|
|
61
|
+
typedi_1.default.get(Logger_1.Logger).error(picocolors_1.default.red([error.httpStatusCode, error.message].join(' ')));
|
|
60
62
|
}
|
|
61
63
|
const { originalUrl } = res.req;
|
|
62
64
|
if (error.errorCode === 404 && originalUrl) {
|
|
@@ -79,7 +81,7 @@ function sendErrorResponse(res, error) {
|
|
|
79
81
|
}
|
|
80
82
|
if (error instanceof n8n_workflow_1.NodeApiError) {
|
|
81
83
|
if (constants_1.inDevelopment) {
|
|
82
|
-
|
|
84
|
+
typedi_1.default.get(Logger_1.Logger).error([picocolors_1.default.red(error.name), error.message].join(' '));
|
|
83
85
|
}
|
|
84
86
|
Object.assign(response, error);
|
|
85
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResponseHelper.js","sourceRoot":"","sources":["../src/ResponseHelper.ts"],"names":[],"mappings":";;;;;;AAEA,4DAAoC;AACpC,+CAIsB;AACtB,6CAAuC;AAEvC,2CAA4C;AAC5C,qFAAiF;
|
|
1
|
+
{"version":3,"file":"ResponseHelper.js","sourceRoot":"","sources":["../src/ResponseHelper.ts"],"names":[],"mappings":"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"}
|
package/dist/WebhookHelpers.js
CHANGED
|
@@ -373,7 +373,8 @@ async function executeWebhook(workflow, webhookData, workflowData, workflowStart
|
|
|
373
373
|
if (binaryData === null || binaryData === void 0 ? void 0 : binaryData.id) {
|
|
374
374
|
res.header(response.headers);
|
|
375
375
|
const stream = await typedi_1.Container.get(n8n_core_1.BinaryDataService).getAsStream(binaryData.id);
|
|
376
|
-
|
|
376
|
+
stream.pipe(res, { end: false });
|
|
377
|
+
await (0, promises_1.finished)(stream);
|
|
377
378
|
responseCallback(null, { noWebhookResponse: true });
|
|
378
379
|
}
|
|
379
380
|
else if (Buffer.isBuffer(response.body)) {
|
|
@@ -400,6 +401,7 @@ async function executeWebhook(workflow, webhookData, workflowData, workflowStart
|
|
|
400
401
|
responseCode,
|
|
401
402
|
});
|
|
402
403
|
}
|
|
404
|
+
process.nextTick(() => res.end());
|
|
403
405
|
didSendResponse = true;
|
|
404
406
|
})
|
|
405
407
|
.catch(async (error) => {
|
|
@@ -441,16 +443,8 @@ async function executeWebhook(workflow, webhookData, workflowData, workflowStart
|
|
|
441
443
|
didSendResponse = true;
|
|
442
444
|
return data;
|
|
443
445
|
}
|
|
444
|
-
if (responseMode === 'responseNode') {
|
|
445
|
-
|
|
446
|
-
responseCallback(null, {
|
|
447
|
-
data: {
|
|
448
|
-
message: 'Workflow executed successfully',
|
|
449
|
-
},
|
|
450
|
-
responseCode,
|
|
451
|
-
});
|
|
452
|
-
didSendResponse = true;
|
|
453
|
-
}
|
|
446
|
+
if (responseMode === 'responseNode' && responsePromise) {
|
|
447
|
+
await Promise.allSettled([responsePromise.promise()]);
|
|
454
448
|
return undefined;
|
|
455
449
|
}
|
|
456
450
|
if (returnData === undefined) {
|
|
@@ -524,14 +518,16 @@ async function executeWebhook(workflow, webhookData, workflowData, workflowStart
|
|
|
524
518
|
res.setHeader('Content-Type', binaryData.mimeType);
|
|
525
519
|
if (binaryData.id) {
|
|
526
520
|
const stream = await typedi_1.Container.get(n8n_core_1.BinaryDataService).getAsStream(binaryData.id);
|
|
527
|
-
|
|
521
|
+
stream.pipe(res, { end: false });
|
|
522
|
+
await (0, promises_1.finished)(stream);
|
|
528
523
|
}
|
|
529
524
|
else {
|
|
530
|
-
res.
|
|
525
|
+
res.write(Buffer.from(binaryData.data, n8n_workflow_1.BINARY_ENCODING));
|
|
531
526
|
}
|
|
532
527
|
responseCallback(null, {
|
|
533
528
|
noWebhookResponse: true,
|
|
534
529
|
});
|
|
530
|
+
process.nextTick(() => res.end());
|
|
535
531
|
}
|
|
536
532
|
}
|
|
537
533
|
else if (responseData === 'noData') {
|