n8n 1.63.3 → 1.64.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/abstract-server.d.ts +1 -2
- package/dist/abstract-server.js +2 -4
- package/dist/abstract-server.js.map +1 -1
- package/dist/active-workflow-manager.d.ts +3 -2
- package/dist/active-workflow-manager.js +5 -3
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.d.ts +1 -2
- package/dist/commands/base-command.js +5 -9
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/execute-batch.js +1 -0
- package/dist/commands/execute-batch.js.map +1 -1
- package/dist/commands/execute.js +1 -0
- package/dist/commands/execute.js.map +1 -1
- package/dist/commands/start.d.ts +0 -2
- package/dist/commands/start.js +16 -13
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.d.ts +0 -2
- package/dist/commands/webhook.js +9 -14
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.d.ts +0 -2
- package/dist/commands/worker.js +27 -17
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.d.ts +0 -1
- package/dist/config/schema.d.ts +0 -5
- package/dist/config/schema.js +0 -5
- package/dist/config/schema.js.map +1 -1
- package/dist/config/types.d.ts +2 -0
- package/dist/controllers/debug.controller.d.ts +3 -1
- package/dist/controllers/debug.controller.js +7 -4
- package/dist/controllers/debug.controller.js.map +1 -1
- package/dist/databases/entities/index.d.ts +2 -0
- package/dist/databases/entities/index.js +2 -0
- package/dist/databases/entities/index.js.map +1 -1
- package/dist/databases/entities/processed-data.d.ts +7 -0
- package/dist/databases/entities/processed-data.js +38 -0
- package/dist/databases/entities/processed-data.js.map +1 -0
- package/dist/databases/migrations/common/1726606152711-CreateProcessedDataTable.d.ts +5 -0
- package/dist/databases/migrations/common/1726606152711-CreateProcessedDataTable.js +20 -0
- package/dist/databases/migrations/common/1726606152711-CreateProcessedDataTable.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/index.js +2 -0
- package/dist/databases/migrations/postgresdb/index.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/processed-data.repository.d.ts +5 -0
- package/dist/databases/repositories/processed-data.repository.js +26 -0
- package/dist/databases/repositories/processed-data.repository.js.map +1 -0
- package/dist/deduplication/deduplication-helper.d.ts +17 -0
- package/dist/deduplication/deduplication-helper.js +236 -0
- package/dist/deduplication/deduplication-helper.js.map +1 -0
- package/dist/deduplication/index.d.ts +2 -0
- package/dist/deduplication/index.js +8 -0
- package/dist/deduplication/index.js.map +1 -0
- package/dist/error-reporting.js +3 -1
- package/dist/error-reporting.js.map +1 -1
- package/dist/errors/deduplication.error.d.ts +4 -0
- package/dist/errors/deduplication.error.js +11 -0
- package/dist/errors/deduplication.error.js.map +1 -0
- package/dist/errors/worker-missing-encryption-key.error.d.ts +4 -0
- package/dist/errors/worker-missing-encryption-key.error.js +15 -0
- package/dist/errors/worker-missing-encryption-key.error.js.map +1 -0
- package/dist/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.js +2 -2
- package/dist/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.js.map +1 -1
- package/dist/events/maps/pub-sub.event-map.d.ts +2 -2
- package/dist/events/relays/telemetry.event-relay.js +9 -3
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/external-secrets/providers/azure-key-vault/azure-key-vault.js +27 -4
- package/dist/external-secrets/providers/azure-key-vault/azure-key-vault.js.map +1 -1
- package/dist/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.js +25 -2
- package/dist/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.js.map +1 -1
- package/dist/interfaces.d.ts +9 -1
- package/dist/interfaces.js.map +1 -1
- package/dist/license.js +1 -2
- package/dist/license.js.map +1 -1
- package/dist/node-types.js +24 -4
- package/dist/node-types.js.map +1 -1
- package/dist/permissions/global-roles.js +0 -1
- package/dist/permissions/global-roles.js.map +1 -1
- package/dist/push/abstract.push.d.ts +3 -1
- package/dist/push/abstract.push.js +23 -2
- package/dist/push/abstract.push.js.map +1 -1
- package/dist/push/sse.push.d.ts +1 -5
- package/dist/push/sse.push.js +22 -21
- package/dist/push/sse.push.js.map +1 -1
- package/dist/push/types.d.ts +1 -0
- package/dist/push/websocket.push.d.ts +1 -3
- package/dist/push/websocket.push.js +6 -19
- package/dist/push/websocket.push.js.map +1 -1
- package/dist/runners/task-broker.service.js +13 -4
- package/dist/runners/task-broker.service.js.map +1 -1
- package/dist/runners/task-managers/{single-main-task-manager.d.ts → local-task-manager.d.ts} +1 -1
- package/dist/runners/task-managers/{single-main-task-manager.js → local-task-manager.js} +4 -4
- package/dist/runners/task-managers/local-task-manager.js.map +1 -0
- package/dist/runners/task-managers/task-manager.d.ts +2 -2
- package/dist/runners/task-managers/task-manager.js +3 -8
- package/dist/runners/task-managers/task-manager.js.map +1 -1
- package/dist/runners/task-runner-process.d.ts +4 -0
- package/dist/runners/task-runner-process.js +55 -8
- package/dist/runners/task-runner-process.js.map +1 -1
- package/dist/scaling/job-processor.d.ts +3 -1
- package/dist/scaling/job-processor.js +26 -13
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/pubsub/publisher.service.d.ts +3 -1
- package/dist/scaling/pubsub/publisher.service.js +8 -4
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/scaling/pubsub/pubsub-handler.d.ts +12 -3
- package/dist/scaling/pubsub/pubsub-handler.js +80 -11
- package/dist/scaling/pubsub/pubsub-handler.js.map +1 -1
- package/dist/scaling/pubsub/pubsub.types.d.ts +7 -4
- package/dist/scaling/pubsub/subscriber.service.d.ts +4 -5
- package/dist/scaling/pubsub/subscriber.service.js +37 -30
- package/dist/scaling/pubsub/subscriber.service.js.map +1 -1
- package/dist/scaling/scaling.service.d.ts +2 -1
- package/dist/scaling/scaling.service.js +56 -16
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/scaling/scaling.types.d.ts +16 -6
- package/dist/scaling/worker-server.js +5 -0
- package/dist/scaling/worker-server.js.map +1 -1
- package/dist/scaling/worker-status.service.d.ts +10 -0
- package/dist/scaling/{worker-status.js → worker-status.service.js} +12 -10
- package/dist/scaling/worker-status.service.js.map +1 -0
- package/dist/server.d.ts +3 -1
- package/dist/server.js +7 -4
- package/dist/server.js.map +1 -1
- package/dist/services/orchestration/main/multi-main-setup.ee.d.ts +0 -1
- package/dist/services/orchestration/main/multi-main-setup.ee.js +10 -12
- package/dist/services/orchestration/main/multi-main-setup.ee.js.map +1 -1
- package/dist/services/orchestration.service.d.ts +0 -3
- package/dist/services/orchestration.service.js +3 -12
- package/dist/services/orchestration.service.js.map +1 -1
- package/dist/services/pruning.service.js +2 -1
- package/dist/services/pruning.service.js.map +1 -1
- package/dist/wait-tracker.d.ts +3 -1
- package/dist/wait-tracker.js +7 -3
- package/dist/wait-tracker.js.map +1 -1
- package/dist/webhooks/webhook-server.d.ts +0 -1
- package/dist/webhooks/webhook-server.js +1 -8
- package/dist/webhooks/webhook-server.js.map +1 -1
- package/dist/workflow-runner.js +1 -2
- package/dist/workflow-runner.js.map +1 -1
- package/package.json +11 -12
- package/dist/runners/task-managers/single-main-task-manager.js.map +0 -1
- package/dist/scaling/worker-status.d.ts +0 -24
- package/dist/scaling/worker-status.js.map +0 -1
- package/dist/services/orchestration/helpers.d.ts +0 -7
- package/dist/services/orchestration/helpers.js +0 -43
- package/dist/services/orchestration/helpers.js.map +0 -1
- package/dist/services/orchestration/main/handle-command-message-main.d.ts +0 -205
- package/dist/services/orchestration/main/handle-command-message-main.js +0 -178
- package/dist/services/orchestration/main/handle-command-message-main.js.map +0 -1
- package/dist/services/orchestration/main/handle-worker-response-message-main.d.ts +0 -7
- package/dist/services/orchestration/main/handle-worker-response-message-main.js +0 -35
- package/dist/services/orchestration/main/handle-worker-response-message-main.js.map +0 -1
- package/dist/services/orchestration/main/orchestration.handler.main.service.d.ts +0 -8
- package/dist/services/orchestration/main/orchestration.handler.main.service.js +0 -37
- package/dist/services/orchestration/main/orchestration.handler.main.service.js.map +0 -1
- package/dist/services/orchestration/main/types.d.ts +0 -5
- package/dist/services/orchestration/main/types.js +0 -3
- package/dist/services/orchestration/main/types.js.map +0 -1
- package/dist/services/orchestration/webhook/orchestration.webhook.service.d.ts +0 -4
- package/dist/services/orchestration/webhook/orchestration.webhook.service.js +0 -27
- package/dist/services/orchestration/webhook/orchestration.webhook.service.js.map +0 -1
- package/dist/services/orchestration/worker/orchestration.worker.service.d.ts +0 -4
- package/dist/services/orchestration/worker/orchestration.worker.service.js +0 -27
- package/dist/services/orchestration/worker/orchestration.worker.service.js.map +0 -1
- package/dist/services/orchestration/worker/types.d.ts +0 -8
- package/dist/services/orchestration/worker/types.js +0 -3
- package/dist/services/orchestration/worker/types.js.map +0 -1
- package/dist/services/orchestration.handler.base.service.d.ts +0 -9
- package/dist/services/orchestration.handler.base.service.js +0 -21
- package/dist/services/orchestration.handler.base.service.js.map +0 -1
|
@@ -1,8 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
26
|
exports.AzureKeyVault = void 0;
|
|
4
|
-
const identity_1 = require("@azure/identity");
|
|
5
|
-
const keyvault_secrets_1 = require("@azure/keyvault-secrets");
|
|
6
27
|
const constants_1 = require("../../../external-secrets/constants");
|
|
7
28
|
class AzureKeyVault {
|
|
8
29
|
constructor() {
|
|
@@ -60,9 +81,11 @@ class AzureKeyVault {
|
|
|
60
81
|
}
|
|
61
82
|
async connect() {
|
|
62
83
|
const { vaultName, tenantId, clientId, clientSecret } = this.settings;
|
|
84
|
+
const { ClientSecretCredential } = await Promise.resolve().then(() => __importStar(require('@azure/identity')));
|
|
85
|
+
const { SecretClient } = await Promise.resolve().then(() => __importStar(require('@azure/keyvault-secrets')));
|
|
63
86
|
try {
|
|
64
|
-
const credential = new
|
|
65
|
-
this.client = new
|
|
87
|
+
const credential = new ClientSecretCredential(tenantId, clientId, clientSecret);
|
|
88
|
+
this.client = new SecretClient(`https://${vaultName}.vault.azure.net/`, credential);
|
|
66
89
|
this.state = 'connected';
|
|
67
90
|
}
|
|
68
91
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azure-key-vault.js","sourceRoot":"","sources":["../../../../src/external-secrets/providers/azure-key-vault/azure-key-vault.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"azure-key-vault.js","sourceRoot":"","sources":["../../../../src/external-secrets/providers/azure-key-vault/azure-key-vault.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
26
|
exports.GcpSecretsManager = void 0;
|
|
4
|
-
const secret_manager_1 = require("@google-cloud/secret-manager");
|
|
5
27
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
28
|
const constants_1 = require("../../../external-secrets/constants");
|
|
7
29
|
class GcpSecretsManager {
|
|
@@ -30,8 +52,9 @@ class GcpSecretsManager {
|
|
|
30
52
|
}
|
|
31
53
|
async connect() {
|
|
32
54
|
const { projectId, privateKey, clientEmail } = this.settings;
|
|
55
|
+
const { SecretManagerServiceClient: GcpClient } = await Promise.resolve().then(() => __importStar(require('@google-cloud/secret-manager')));
|
|
33
56
|
try {
|
|
34
|
-
this.client = new
|
|
57
|
+
this.client = new GcpClient({
|
|
35
58
|
credentials: { client_email: clientEmail, private_key: privateKey },
|
|
36
59
|
projectId,
|
|
37
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gcp-secrets-manager.js","sourceRoot":"","sources":["../../../../src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gcp-secrets-manager.js","sourceRoot":"","sources":["../../../../src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/interfaces.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Scope } from '@n8n/permissions';
|
|
2
2
|
import type { Application } from 'express';
|
|
3
3
|
import type { WorkflowExecute } from 'n8n-core';
|
|
4
|
-
import type { ExecutionError, ICredentialDataDecryptedObject, ICredentialsDecrypted, ICredentialsEncrypted, IDataObject, IDeferredPromise, IExecuteResponsePromiseData, IRun, IRunExecutionData, ITelemetryTrackProperties, IWorkflowBase, CredentialLoadingDetails, Workflow, WorkflowExecuteMode, ExecutionStatus, ExecutionSummary, FeatureFlags, INodeProperties, IUserSettings, IWorkflowExecutionDataProcess } from 'n8n-workflow';
|
|
4
|
+
import type { ExecutionError, ICredentialDataDecryptedObject, ICredentialsDecrypted, ICredentialsEncrypted, IDataObject, IDeferredPromise, IExecuteResponsePromiseData, IRun, IRunExecutionData, ITelemetryTrackProperties, IWorkflowBase, CredentialLoadingDetails, Workflow, WorkflowExecuteMode, ExecutionStatus, ExecutionSummary, FeatureFlags, INodeProperties, IUserSettings, IWorkflowExecutionDataProcess, DeduplicationMode, DeduplicationItemTypes } from 'n8n-workflow';
|
|
5
5
|
import type PCancelable from 'p-cancelable';
|
|
6
6
|
import type { ActiveWorkflowManager } from './active-workflow-manager';
|
|
7
7
|
import type { AnnotationTagEntity } from './databases/entities/annotation-tag-entity.ee';
|
|
@@ -22,6 +22,14 @@ export interface ICredentialsTypeData {
|
|
|
22
22
|
export interface ICredentialsOverwrite {
|
|
23
23
|
[key: string]: ICredentialDataDecryptedObject;
|
|
24
24
|
}
|
|
25
|
+
export interface IProcessedDataLatest {
|
|
26
|
+
mode: DeduplicationMode;
|
|
27
|
+
data: DeduplicationItemTypes;
|
|
28
|
+
}
|
|
29
|
+
export interface IProcessedDataEntries {
|
|
30
|
+
mode: DeduplicationMode;
|
|
31
|
+
data: DeduplicationItemTypes[];
|
|
32
|
+
}
|
|
25
33
|
export interface ITagBase {
|
|
26
34
|
id: string;
|
|
27
35
|
name: string;
|
package/dist/interfaces.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AAmaA,MAAsB,eAAe;CAiBpC;AAjBD,0CAiBC"}
|
package/dist/license.js
CHANGED
|
@@ -135,8 +135,7 @@ let License = class License {
|
|
|
135
135
|
if (config_1.default.getEnv('executions.mode') === 'queue' && config_1.default.getEnv('multiMainSetup.enabled')) {
|
|
136
136
|
const isMultiMainLicensed = _features[constants_1.LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES];
|
|
137
137
|
this.orchestrationService.setMultiMainSetupLicensed(isMultiMainLicensed ?? false);
|
|
138
|
-
if (this.orchestrationService.isMultiMainSetupEnabled &&
|
|
139
|
-
this.orchestrationService.isFollower) {
|
|
138
|
+
if (this.orchestrationService.isMultiMainSetupEnabled && this.instanceSettings.isFollower) {
|
|
140
139
|
this.logger.debug('[Multi-main setup] Instance is follower, skipping sending of "reload-license" command...');
|
|
141
140
|
return;
|
|
142
141
|
}
|
package/dist/license.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license.js","sourceRoot":"","sources":["../src/license.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"license.js","sourceRoot":"","sources":["../src/license.ts"],"names":[],"mappings":"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"}
|
package/dist/node-types.js
CHANGED
|
@@ -34,11 +34,31 @@ let NodeTypes = class NodeTypes {
|
|
|
34
34
|
return this.getNode(nodeType).type;
|
|
35
35
|
}
|
|
36
36
|
getByNameAndVersion(nodeType, version) {
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
const origType = nodeType;
|
|
38
|
+
const toolRequested = nodeType.startsWith('n8n-nodes-base') && nodeType.endsWith('Tool');
|
|
39
|
+
if (toolRequested) {
|
|
40
|
+
nodeType = nodeType.replace(/Tool$/, '');
|
|
40
41
|
}
|
|
41
|
-
|
|
42
|
+
const node = this.getNode(nodeType);
|
|
43
|
+
const versionedNodeType = n8n_workflow_1.NodeHelpers.getVersionedNodeType(node.type, version);
|
|
44
|
+
if (!toolRequested)
|
|
45
|
+
return versionedNodeType;
|
|
46
|
+
if (!versionedNodeType.description.usableAsTool)
|
|
47
|
+
throw new n8n_workflow_1.ApplicationError('Node cannot be used as a tool', { extra: { nodeType } });
|
|
48
|
+
const { loadedNodes } = this.loadNodesAndCredentials;
|
|
49
|
+
if (origType in loadedNodes) {
|
|
50
|
+
return loadedNodes[origType].type;
|
|
51
|
+
}
|
|
52
|
+
const clonedProperties = Object.create(versionedNodeType.description.properties);
|
|
53
|
+
const clonedDescription = Object.create(versionedNodeType.description, {
|
|
54
|
+
properties: { value: clonedProperties },
|
|
55
|
+
});
|
|
56
|
+
const clonedNode = Object.create(versionedNodeType, {
|
|
57
|
+
description: { value: clonedDescription },
|
|
58
|
+
});
|
|
59
|
+
const tool = n8n_workflow_1.NodeHelpers.convertNodeToAiTool(clonedNode);
|
|
60
|
+
loadedNodes[nodeType + 'Tool'] = { sourcePath: '', type: tool };
|
|
61
|
+
return tool;
|
|
42
62
|
}
|
|
43
63
|
applySpecialNodeParameters() {
|
|
44
64
|
for (const nodeTypeData of Object.values(this.loadNodesAndCredentials.loadedNodes)) {
|
package/dist/node-types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-types.js","sourceRoot":"","sources":["../src/node-types.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0CAAsC;AACtC,uCAAgD;AAQhD,+CAA6D;AAC7D,+BAAqC;AACrC,mCAAiC;AAEjC,wFAAkF;AAClF,6EAAuE;AAGhE,IAAM,SAAS,GAAf,MAAM,SAAS;IACrB,YAAoB,uBAAgD;QAAhD,4BAAuB,GAAvB,uBAAuB,CAAyB;QACnE,uBAAuB,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACzF,CAAC;IAKD,iBAAiB,CAChB,YAAoB,EACpB,OAAe;QAEf,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE5C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,+BAAgB,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,0BAAW,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEjF,OAAO,EAAE,WAAW,EAAE,EAAE,GAAG,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC;IAC7E,CAAC;IAED,SAAS,CAAC,QAAgB;QACzB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;IACpC,CAAC;IAED,mBAAmB,CAAC,QAAgB,EAAE,OAAgB;QACrD,MAAM,
|
|
1
|
+
{"version":3,"file":"node-types.js","sourceRoot":"","sources":["../src/node-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-roles.js","sourceRoot":"","sources":["../../src/permissions/global-roles.ts"],"names":[],"mappings":";;;AAEa,QAAA,mBAAmB,GAAY;IAC3C,sBAAsB;IACtB,oBAAoB;IACpB,sBAAsB;IACtB,sBAAsB;IACtB,oBAAoB;IACpB,kBAAkB;IAClB,gBAAgB;IAChB,mBAAmB;IACnB,iBAAiB;IACjB,mBAAmB;IACnB,mBAAmB;IACnB,iBAAiB;IACjB,kBAAkB;IAClB,iBAAiB;IACjB,0BAA0B;IAC1B,4BAA4B;IAC5B,yBAAyB;IACzB,uBAAuB;IACvB,4BAA4B;IAC5B,0BAA0B;IAC1B,4BAA4B;IAC5B,4BAA4B;IAC5B,0BAA0B;IAC1B,0BAA0B;IAC1B,gCAAgC;IAChC,8BAA8B;IAC9B,gCAAgC;IAChC,gCAAgC;IAChC,8BAA8B;IAC9B,8BAA8B;IAC9B,qBAAqB;IACrB,oBAAoB;IACpB,aAAa;IACb,WAAW;IACX,gBAAgB;IAChB,qBAAqB;IACrB,oBAAoB;IACpB,
|
|
1
|
+
{"version":3,"file":"global-roles.js","sourceRoot":"","sources":["../../src/permissions/global-roles.ts"],"names":[],"mappings":";;;AAEa,QAAA,mBAAmB,GAAY;IAC3C,sBAAsB;IACtB,oBAAoB;IACpB,sBAAsB;IACtB,sBAAsB;IACtB,oBAAoB;IACpB,kBAAkB;IAClB,gBAAgB;IAChB,mBAAmB;IACnB,iBAAiB;IACjB,mBAAmB;IACnB,mBAAmB;IACnB,iBAAiB;IACjB,kBAAkB;IAClB,iBAAiB;IACjB,0BAA0B;IAC1B,4BAA4B;IAC5B,yBAAyB;IACzB,uBAAuB;IACvB,4BAA4B;IAC5B,0BAA0B;IAC1B,4BAA4B;IAC5B,4BAA4B;IAC5B,0BAA0B;IAC1B,0BAA0B;IAC1B,gCAAgC;IAChC,8BAA8B;IAC9B,gCAAgC;IAChC,gCAAgC;IAChC,8BAA8B;IAC9B,8BAA8B;IAC9B,qBAAqB;IACrB,oBAAoB;IACpB,aAAa;IACb,WAAW;IACX,gBAAgB;IAChB,qBAAqB;IACrB,oBAAoB;IACpB,aAAa;IACb,wBAAwB;IACxB,oBAAoB;IACpB,oBAAoB;IACpB,sBAAsB;IACtB,YAAY;IACZ,UAAU;IACV,YAAY;IACZ,YAAY;IACZ,UAAU;IACV,aAAa;IACb,WAAW;IACX,aAAa;IACb,aAAa;IACb,WAAW;IACX,oBAAoB;IACpB,iBAAiB;IACjB,iBAAiB;IACjB,eAAe;IACf,iBAAiB;IACjB,iBAAiB;IACjB,eAAe;IACf,iBAAiB;IACjB,eAAe;IACf,iBAAiB;IACjB,iBAAiB;IACjB,eAAe;IACf,gBAAgB;IAChB,kBAAkB;IAClB,eAAe;IACf,oBAAoB;IACpB,cAAc;IACd,gBAAgB;IAChB,cAAc;IACd,gBAAgB;IAChB,gBAAgB;CAChB,CAAC;AAEW,QAAA,mBAAmB,GAAG,2BAAmB,CAAC,MAAM,EAAE,CAAC;AAEnD,QAAA,oBAAoB,GAAY;IAC5C,sBAAsB;IACtB,oBAAoB;IACpB,sBAAsB;IACtB,sBAAsB;IACtB,oBAAoB;IACpB,0BAA0B;IAC1B,0BAA0B;IAC1B,YAAY;IACZ,UAAU;IACV,YAAY;IACZ,UAAU;IACV,WAAW;IACX,eAAe;IACf,eAAe;CACf,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { PushPayload, PushType } from '@n8n/api-types';
|
|
2
2
|
import type { User } from '../databases/entities/user';
|
|
3
|
-
import
|
|
3
|
+
import { Logger } from '../logging/logger.service';
|
|
4
4
|
import type { OnPushMessage } from '../push/types';
|
|
5
5
|
import { TypedEmitter } from '../typed-emitter';
|
|
6
6
|
export interface AbstractPushEvents {
|
|
@@ -12,11 +12,13 @@ export declare abstract class AbstractPush<Connection> extends TypedEmitter<Abst
|
|
|
12
12
|
protected userIdByPushRef: Record<string, string>;
|
|
13
13
|
protected abstract close(connection: Connection): void;
|
|
14
14
|
protected abstract sendToOneConnection(connection: Connection, data: string): void;
|
|
15
|
+
protected abstract ping(connection: Connection): void;
|
|
15
16
|
constructor(logger: Logger);
|
|
16
17
|
protected add(pushRef: string, userId: User['id'], connection: Connection): void;
|
|
17
18
|
protected onMessageReceived(pushRef: string, msg: unknown): void;
|
|
18
19
|
protected remove(pushRef?: string): void;
|
|
19
20
|
private sendTo;
|
|
21
|
+
private pingAll;
|
|
20
22
|
sendToAll<Type extends PushType>(type: Type, data: PushPayload<Type>): void;
|
|
21
23
|
sendToOne<Type extends PushType>(type: Type, data: PushPayload<Type>, pushRef: string): void;
|
|
22
24
|
sendToUsers<Type extends PushType>(type: Type, data: PushPayload<Type>, userIds: Array<User['id']>): void;
|
|
@@ -1,14 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
12
|
exports.AbstractPush = void 0;
|
|
4
13
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
14
|
+
const typedi_1 = require("typedi");
|
|
15
|
+
const logger_service_1 = require("../logging/logger.service");
|
|
5
16
|
const typed_emitter_1 = require("../typed-emitter");
|
|
6
|
-
class AbstractPush extends typed_emitter_1.TypedEmitter {
|
|
17
|
+
let AbstractPush = class AbstractPush extends typed_emitter_1.TypedEmitter {
|
|
7
18
|
constructor(logger) {
|
|
8
19
|
super();
|
|
9
20
|
this.logger = logger;
|
|
10
21
|
this.connections = {};
|
|
11
22
|
this.userIdByPushRef = {};
|
|
23
|
+
setInterval(() => this.pingAll(), 60 * 1000);
|
|
12
24
|
}
|
|
13
25
|
add(pushRef, userId, connection) {
|
|
14
26
|
const { connections, userIdByPushRef } = this;
|
|
@@ -44,6 +56,11 @@ class AbstractPush extends typed_emitter_1.TypedEmitter {
|
|
|
44
56
|
this.sendToOneConnection(connection, stringifiedPayload);
|
|
45
57
|
}
|
|
46
58
|
}
|
|
59
|
+
pingAll() {
|
|
60
|
+
for (const pushRef in this.connections) {
|
|
61
|
+
this.ping(this.connections[pushRef]);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
47
64
|
sendToAll(type, data) {
|
|
48
65
|
this.sendTo(type, data, Object.keys(this.connections));
|
|
49
66
|
}
|
|
@@ -67,6 +84,10 @@ class AbstractPush extends typed_emitter_1.TypedEmitter {
|
|
|
67
84
|
hasPushRef(pushRef) {
|
|
68
85
|
return this.connections[pushRef] !== undefined;
|
|
69
86
|
}
|
|
70
|
-
}
|
|
87
|
+
};
|
|
71
88
|
exports.AbstractPush = AbstractPush;
|
|
89
|
+
exports.AbstractPush = AbstractPush = __decorate([
|
|
90
|
+
(0, typedi_1.Service)(),
|
|
91
|
+
__metadata("design:paramtypes", [logger_service_1.Logger])
|
|
92
|
+
], AbstractPush);
|
|
72
93
|
//# sourceMappingURL=abstract.push.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract.push.js","sourceRoot":"","sources":["../../src/push/abstract.push.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"abstract.push.js","sourceRoot":"","sources":["../../src/push/abstract.push.ts"],"names":[],"mappings":"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"}
|
package/dist/push/sse.push.d.ts
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import type { User } from '../databases/entities/user';
|
|
2
|
-
import { Logger } from '../logging/logger.service';
|
|
3
|
-
import SSEChannel from 'sse-channel';
|
|
4
2
|
import { AbstractPush } from './abstract.push';
|
|
5
3
|
import type { PushRequest, PushResponse } from './types';
|
|
6
4
|
type Connection = {
|
|
@@ -8,11 +6,9 @@ type Connection = {
|
|
|
8
6
|
res: PushResponse;
|
|
9
7
|
};
|
|
10
8
|
export declare class SSEPush extends AbstractPush<Connection> {
|
|
11
|
-
readonly channel: SSEChannel;
|
|
12
|
-
readonly connections: Record<string, Connection>;
|
|
13
|
-
constructor(logger: Logger);
|
|
14
9
|
add(pushRef: string, userId: User['id'], connection: Connection): void;
|
|
15
10
|
protected close({ res }: Connection): void;
|
|
16
11
|
protected sendToOneConnection(connection: Connection, data: string): void;
|
|
12
|
+
protected ping({ res }: Connection): void;
|
|
17
13
|
}
|
|
18
14
|
export {};
|
package/dist/push/sse.push.js
CHANGED
|
@@ -5,42 +5,43 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
9
|
exports.SSEPush = void 0;
|
|
16
10
|
const typedi_1 = require("typedi");
|
|
17
|
-
const logger_service_1 = require("../logging/logger.service");
|
|
18
|
-
const sse_channel_1 = __importDefault(require("sse-channel"));
|
|
19
11
|
const abstract_push_1 = require("./abstract.push");
|
|
20
12
|
let SSEPush = class SSEPush extends abstract_push_1.AbstractPush {
|
|
21
|
-
constructor(logger) {
|
|
22
|
-
super(logger);
|
|
23
|
-
this.channel = new sse_channel_1.default();
|
|
24
|
-
this.connections = {};
|
|
25
|
-
this.channel.on('disconnect', (_, { req }) => {
|
|
26
|
-
this.remove(req?.query?.pushRef);
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
13
|
add(pushRef, userId, connection) {
|
|
14
|
+
const { req, res } = connection;
|
|
15
|
+
req.socket.setTimeout(0);
|
|
16
|
+
req.socket.setNoDelay(true);
|
|
17
|
+
req.socket.setKeepAlive(true);
|
|
18
|
+
res.setHeader('Content-Type', 'text/event-stream; charset=UTF-8');
|
|
19
|
+
res.setHeader('Cache-Control', 'no-cache');
|
|
20
|
+
res.setHeader('Connection', 'keep-alive');
|
|
21
|
+
res.writeHead(200);
|
|
22
|
+
res.write(':ok\n\n');
|
|
23
|
+
res.flush();
|
|
30
24
|
super.add(pushRef, userId, connection);
|
|
31
|
-
this.
|
|
25
|
+
const removeClient = () => this.remove(pushRef);
|
|
26
|
+
req.once('end', removeClient);
|
|
27
|
+
req.once('close', removeClient);
|
|
28
|
+
res.once('finish', removeClient);
|
|
32
29
|
}
|
|
33
30
|
close({ res }) {
|
|
34
31
|
res.end();
|
|
35
|
-
this.channel.removeClient(res);
|
|
36
32
|
}
|
|
37
33
|
sendToOneConnection(connection, data) {
|
|
38
|
-
|
|
34
|
+
const { res } = connection;
|
|
35
|
+
res.write('data: ' + data + '\n\n');
|
|
36
|
+
res.flush();
|
|
37
|
+
}
|
|
38
|
+
ping({ res }) {
|
|
39
|
+
res.write(':ping\n\n');
|
|
40
|
+
res.flush();
|
|
39
41
|
}
|
|
40
42
|
};
|
|
41
43
|
exports.SSEPush = SSEPush;
|
|
42
44
|
exports.SSEPush = SSEPush = __decorate([
|
|
43
|
-
(0, typedi_1.Service)()
|
|
44
|
-
__metadata("design:paramtypes", [logger_service_1.Logger])
|
|
45
|
+
(0, typedi_1.Service)()
|
|
45
46
|
], SSEPush);
|
|
46
47
|
//# sourceMappingURL=sse.push.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse.push.js","sourceRoot":"","sources":["../../src/push/sse.push.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sse.push.js","sourceRoot":"","sources":["../../src/push/sse.push.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAAiC;AAIjC,mDAA+C;AAMxC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,4BAAwB;IACpD,GAAG,CAAC,OAAe,EAAE,MAAkB,EAAE,UAAsB;QAC9D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;QAGhC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACzB,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5B,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC9B,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,kCAAkC,CAAC,CAAC;QAClE,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QAC3C,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC1C,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrB,GAAG,CAAC,KAAK,EAAE,CAAC;QAEZ,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAGvC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChD,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAC9B,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAChC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAClC,CAAC;IAES,KAAK,CAAC,EAAE,GAAG,EAAc;QAClC,GAAG,CAAC,GAAG,EAAE,CAAC;IACX,CAAC;IAES,mBAAmB,CAAC,UAAsB,EAAE,IAAY;QACjE,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;QAC3B,GAAG,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;IAES,IAAI,CAAC,EAAE,GAAG,EAAc;QACjC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACvB,GAAG,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;CACD,CAAA;AAtCY,0BAAO;kBAAP,OAAO;IADnB,IAAA,gBAAO,GAAE;GACG,OAAO,CAsCnB"}
|
package/dist/push/types.d.ts
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import type WebSocket from 'ws';
|
|
2
2
|
import type { User } from '../databases/entities/user';
|
|
3
|
-
import { Logger } from '../logging/logger.service';
|
|
4
3
|
import { AbstractPush } from './abstract.push';
|
|
5
4
|
export declare class WebSocketPush extends AbstractPush<WebSocket> {
|
|
6
|
-
constructor(logger: Logger);
|
|
7
5
|
add(pushRef: string, userId: User['id'], connection: WebSocket): void;
|
|
8
6
|
protected close(connection: WebSocket): void;
|
|
9
7
|
protected sendToOneConnection(connection: WebSocket, data: string): void;
|
|
10
|
-
|
|
8
|
+
protected ping(connection: WebSocket): void;
|
|
11
9
|
}
|
|
@@ -5,23 +5,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
9
|
exports.WebSocketPush = void 0;
|
|
13
10
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
14
11
|
const typedi_1 = require("typedi");
|
|
15
|
-
const logger_service_1 = require("../logging/logger.service");
|
|
16
12
|
const abstract_push_1 = require("./abstract.push");
|
|
17
13
|
function heartbeat() {
|
|
18
14
|
this.isAlive = true;
|
|
19
15
|
}
|
|
20
16
|
let WebSocketPush = class WebSocketPush extends abstract_push_1.AbstractPush {
|
|
21
|
-
constructor(logger) {
|
|
22
|
-
super(logger);
|
|
23
|
-
setInterval(() => this.pingAll(), 60 * 1000);
|
|
24
|
-
}
|
|
25
17
|
add(pushRef, userId, connection) {
|
|
26
18
|
connection.isAlive = true;
|
|
27
19
|
connection.on('pong', heartbeat);
|
|
@@ -59,21 +51,16 @@ let WebSocketPush = class WebSocketPush extends abstract_push_1.AbstractPush {
|
|
|
59
51
|
sendToOneConnection(connection, data) {
|
|
60
52
|
connection.send(data);
|
|
61
53
|
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
if (!connection.isAlive) {
|
|
66
|
-
delete this.connections[pushRef];
|
|
67
|
-
return connection.terminate();
|
|
68
|
-
}
|
|
69
|
-
connection.isAlive = false;
|
|
70
|
-
connection.ping();
|
|
54
|
+
ping(connection) {
|
|
55
|
+
if (!connection.isAlive) {
|
|
56
|
+
return connection.terminate();
|
|
71
57
|
}
|
|
58
|
+
connection.isAlive = false;
|
|
59
|
+
connection.ping();
|
|
72
60
|
}
|
|
73
61
|
};
|
|
74
62
|
exports.WebSocketPush = WebSocketPush;
|
|
75
63
|
exports.WebSocketPush = WebSocketPush = __decorate([
|
|
76
|
-
(0, typedi_1.Service)()
|
|
77
|
-
__metadata("design:paramtypes", [logger_service_1.Logger])
|
|
64
|
+
(0, typedi_1.Service)()
|
|
78
65
|
], WebSocketPush);
|
|
79
66
|
//# sourceMappingURL=websocket.push.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.push.js","sourceRoot":"","sources":["../../src/push/websocket.push.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"websocket.push.js","sourceRoot":"","sources":["../../src/push/websocket.push.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+CAAoE;AACpE,mCAAiC;AAKjC,mDAA+C;AAE/C,SAAS,SAAS;IACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;AACrB,CAAC;AAGM,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,4BAAuB;IACzD,GAAG,CAAC,OAAe,EAAE,MAAkB,EAAE,UAAqB;QAC7D,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;QAC1B,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEjC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAEvC,MAAM,SAAS,GAAG,CAAC,IAAuB,EAAE,EAAE;YAC7C,IAAI,CAAC;gBACJ,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE7E,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACtE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,iCAAkB,CAAC,KAAK,CACvB,IAAI,+BAAgB,CAAC,4BAA4B,EAAE;oBAClD,KAAK,EAAE;wBACN,MAAM;wBACN,IAAI;qBACJ;oBACD,KAAK,EAAE,KAAK;iBACZ,CAAC,CACF,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE;oBAC1D,KAAK,EAAE,KAAgB;oBACvB,OAAO;oBACP,IAAI;iBACJ,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC;QAGF,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YAC7B,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAClC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC;IAES,KAAK,CAAC,UAAqB;QACpC,UAAU,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;IAES,mBAAmB,CAAC,UAAqB,EAAE,IAAY;QAChE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAES,IAAI,CAAC,UAAqB;QAEnC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC;QAC/B,CAAC;QACD,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;QAC3B,UAAU,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC;CACD,CAAA;AAxDY,sCAAa;wBAAb,aAAa;IADzB,IAAA,gBAAO,GAAE;GACG,aAAa,CAwDzB"}
|
|
@@ -28,19 +28,28 @@ let TaskBroker = class TaskBroker {
|
|
|
28
28
|
}
|
|
29
29
|
expireTasks() {
|
|
30
30
|
const now = process.hrtime.bigint();
|
|
31
|
-
|
|
32
|
-
for (let i = 0; i < this.pendingTaskOffers.length; i++) {
|
|
31
|
+
for (let i = this.pendingTaskOffers.length - 1; i >= 0; i--) {
|
|
33
32
|
if (this.pendingTaskOffers[i].validUntil < now) {
|
|
34
|
-
|
|
33
|
+
this.pendingTaskOffers.splice(i, 1);
|
|
35
34
|
}
|
|
36
35
|
}
|
|
37
|
-
invalidOffers.reverse().forEach((i) => this.pendingTaskOffers.splice(i, 1));
|
|
38
36
|
}
|
|
39
37
|
registerRunner(runner, messageCallback) {
|
|
40
38
|
this.knownRunners.set(runner.id, { runner, messageCallback });
|
|
41
39
|
}
|
|
42
40
|
deregisterRunner(runnerId) {
|
|
43
41
|
this.knownRunners.delete(runnerId);
|
|
42
|
+
for (let i = this.pendingTaskOffers.length - 1; i >= 0; i--) {
|
|
43
|
+
if (this.pendingTaskOffers[i].runnerId === runnerId) {
|
|
44
|
+
this.pendingTaskOffers.splice(i, 1);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
for (const task of this.tasks.values()) {
|
|
48
|
+
if (task.runnerId === runnerId) {
|
|
49
|
+
void this.failTask(task.id, `The Task Runner (${runnerId}) has disconnected`);
|
|
50
|
+
this.handleRunnerReject(task.id, `The Task Runner (${runnerId}) has disconnected`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
44
53
|
}
|
|
45
54
|
registerRequester(requesterId, messageCallback) {
|
|
46
55
|
this.requesters.set(requesterId, messageCallback);
|