n8n 2.10.2 → 2.10.3
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/build.tsbuildinfo +1 -1
- package/dist/collaboration/collaboration.service.d.ts +4 -1
- package/dist/collaboration/collaboration.service.js +17 -2
- package/dist/collaboration/collaboration.service.js.map +1 -1
- package/dist/collaboration/collaboration.state.d.ts +1 -1
- package/dist/collaboration/collaboration.state.js +27 -13
- package/dist/collaboration/collaboration.state.js.map +1 -1
- package/package.json +13 -13
|
@@ -1,18 +1,21 @@
|
|
|
1
1
|
import type { User } from '@n8n/db';
|
|
2
2
|
import { UserRepository } from '@n8n/db';
|
|
3
|
+
import { Logger } from '@n8n/backend-common';
|
|
3
4
|
import { ErrorReporter } from 'n8n-core';
|
|
4
5
|
import type { Workflow } from 'n8n-workflow';
|
|
5
6
|
import { CollaborationState } from '../collaboration/collaboration.state';
|
|
6
7
|
import { Push } from '../push';
|
|
7
8
|
import { AccessService } from '../services/access.service';
|
|
8
9
|
export declare class CollaborationService {
|
|
10
|
+
private readonly logger;
|
|
9
11
|
private readonly errorReporter;
|
|
10
12
|
private readonly push;
|
|
11
13
|
private readonly state;
|
|
12
14
|
private readonly userRepository;
|
|
13
15
|
private readonly accessService;
|
|
14
|
-
constructor(errorReporter: ErrorReporter, push: Push, state: CollaborationState, userRepository: UserRepository, accessService: AccessService);
|
|
16
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, push: Push, state: CollaborationState, userRepository: UserRepository, accessService: AccessService);
|
|
15
17
|
init(): void;
|
|
18
|
+
private isTransientError;
|
|
16
19
|
handleUserMessage(userId: User['id'], clientId: string, msg: unknown): Promise<void>;
|
|
17
20
|
private handleWorkflowOpened;
|
|
18
21
|
private handleWorkflowClosed;
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CollaborationService = void 0;
|
|
13
13
|
const db_1 = require("@n8n/db");
|
|
14
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
14
15
|
const di_1 = require("@n8n/di");
|
|
15
16
|
const n8n_core_1 = require("n8n-core");
|
|
16
17
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
@@ -21,7 +22,8 @@ const locked_error_1 = require("../errors/response-errors/locked.error");
|
|
|
21
22
|
const push_1 = require("../push");
|
|
22
23
|
const access_service_1 = require("../services/access.service");
|
|
23
24
|
let CollaborationService = class CollaborationService {
|
|
24
|
-
constructor(errorReporter, push, state, userRepository, accessService) {
|
|
25
|
+
constructor(logger, errorReporter, push, state, userRepository, accessService) {
|
|
26
|
+
this.logger = logger;
|
|
25
27
|
this.errorReporter = errorReporter;
|
|
26
28
|
this.push = push;
|
|
27
29
|
this.state = state;
|
|
@@ -34,6 +36,12 @@ let CollaborationService = class CollaborationService {
|
|
|
34
36
|
await this.handleUserMessage(event.userId, event.pushRef, event.msg);
|
|
35
37
|
}
|
|
36
38
|
catch (error) {
|
|
39
|
+
if (this.isTransientError(error)) {
|
|
40
|
+
this.logger.debug('Transient infrastructure error in collaboration service', {
|
|
41
|
+
error,
|
|
42
|
+
});
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
37
45
|
this.errorReporter.error(new n8n_workflow_1.UnexpectedError('Error handling CollaborationService push message', {
|
|
38
46
|
extra: {
|
|
39
47
|
msg: event.msg,
|
|
@@ -45,6 +53,12 @@ let CollaborationService = class CollaborationService {
|
|
|
45
53
|
}
|
|
46
54
|
});
|
|
47
55
|
}
|
|
56
|
+
isTransientError(error) {
|
|
57
|
+
return (error instanceof Error &&
|
|
58
|
+
'code' in error &&
|
|
59
|
+
typeof error.code === 'string' &&
|
|
60
|
+
['ECONNREFUSED', 'ETIMEDOUT', 'ENOTFOUND', 'ECONNRESET'].includes(error.code));
|
|
61
|
+
}
|
|
48
62
|
async handleUserMessage(userId, clientId, msg) {
|
|
49
63
|
const workflowMessage = await (0, collaboration_message_1.parseWorkflowMessage)(msg);
|
|
50
64
|
if (workflowMessage.type === 'workflowOpened') {
|
|
@@ -198,7 +212,8 @@ let CollaborationService = class CollaborationService {
|
|
|
198
212
|
exports.CollaborationService = CollaborationService;
|
|
199
213
|
exports.CollaborationService = CollaborationService = __decorate([
|
|
200
214
|
(0, di_1.Service)(),
|
|
201
|
-
__metadata("design:paramtypes", [
|
|
215
|
+
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
216
|
+
n8n_core_1.ErrorReporter,
|
|
202
217
|
push_1.Push,
|
|
203
218
|
collaboration_state_1.CollaborationState,
|
|
204
219
|
db_1.UserRepository,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collaboration.service.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,gCAAyC;AACzC,gCAAkC;AAClC,uCAAyC;AAEzC,+CAA+C;AAS/C,mEAA+D;AAE/D,6EAAyE;AACzE,4EAAwE;AACxE,wEAAoE;AACpE,iCAA8B;AAE9B,8DAA0D;AAOnD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YACkB,aAA4B,EAC5B,IAAU,EACV,KAAyB,EACzB,cAA8B,EAC9B,aAA4B;
|
|
1
|
+
{"version":3,"file":"collaboration.service.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare class CollaborationState {
|
|
|
16
16
|
private formWorkflowCacheKey;
|
|
17
17
|
private splitToExpiredAndStillActive;
|
|
18
18
|
private removeExpiredCollaborators;
|
|
19
|
-
private
|
|
19
|
+
private parseCacheHashToCollaborators;
|
|
20
20
|
private hasSessionExpired;
|
|
21
21
|
readonly writeLockTtl: number;
|
|
22
22
|
setWriteLock(workflowId: Workflow['id'], clientId: string, userId: User['id']): Promise<void>;
|
|
@@ -37,10 +37,11 @@ let CollaborationState = class CollaborationState {
|
|
|
37
37
|
if (!cacheValue) {
|
|
38
38
|
return [];
|
|
39
39
|
}
|
|
40
|
-
const
|
|
41
|
-
const [expired, stillActive] = this.splitToExpiredAndStillActive(
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
const { valid, invalid } = this.parseCacheHashToCollaborators(cacheValue);
|
|
41
|
+
const [expired, stillActive] = this.splitToExpiredAndStillActive(valid);
|
|
42
|
+
const toRemove = [...expired, ...invalid];
|
|
43
|
+
if (toRemove.length > 0) {
|
|
44
|
+
void this.removeExpiredCollaborators(workflowId, toRemove);
|
|
44
45
|
}
|
|
45
46
|
const userMap = new Map();
|
|
46
47
|
for (const entry of stillActive) {
|
|
@@ -71,15 +72,28 @@ let CollaborationState = class CollaborationState {
|
|
|
71
72
|
const cacheKey = this.formWorkflowCacheKey(workflowId);
|
|
72
73
|
await Promise.all(expiredClients.map(async (client) => await this.cache.deleteFromHash(cacheKey, client.clientId)));
|
|
73
74
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
75
|
+
parseCacheHashToCollaborators(workflowCacheEntry) {
|
|
76
|
+
const valid = [];
|
|
77
|
+
const invalid = [];
|
|
78
|
+
for (const [clientId, value] of Object.entries(workflowCacheEntry)) {
|
|
79
|
+
const parts = value.split('|');
|
|
80
|
+
if (parts.length === 1) {
|
|
81
|
+
invalid.push({
|
|
82
|
+
clientId,
|
|
83
|
+
userId: '',
|
|
84
|
+
lastSeen: value,
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
const [userId, lastSeen] = parts;
|
|
89
|
+
valid.push({
|
|
90
|
+
userId,
|
|
91
|
+
lastSeen,
|
|
92
|
+
clientId,
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
return { valid, invalid };
|
|
83
97
|
}
|
|
84
98
|
hasSessionExpired(lastSeenString) {
|
|
85
99
|
const expiryTime = new Date(lastSeenString).getTime() + this.inactivityCleanUpTime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collaboration.state.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.state.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,8CAAsC;AAEtC,gCAAkC;AAElC,+CAAyC;AAEzC,kEAA8D;AAoBvD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAO9B,YAA6B,KAAmB;QAAnB,UAAK,GAAL,KAAK,CAAc;QAFvC,0BAAqB,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"collaboration.state.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.state.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n",
|
|
3
|
-
"version": "2.10.
|
|
3
|
+
"version": "2.10.3",
|
|
4
4
|
"description": "n8n Workflow Automation Tool",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
"bin",
|
|
23
23
|
"templates",
|
|
24
24
|
"dist",
|
|
25
|
-
"
|
|
26
|
-
"
|
|
25
|
+
"LICENSE.md",
|
|
26
|
+
"LICENSE_EE.md"
|
|
27
27
|
],
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@redocly/cli": "^1.28.5",
|
|
@@ -146,24 +146,24 @@
|
|
|
146
146
|
"@n8n/ai-workflow-builder": "1.10.2",
|
|
147
147
|
"@n8n/api-types": "1.10.2",
|
|
148
148
|
"@n8n/backend-common": "1.10.1",
|
|
149
|
-
"@n8n/chat-hub": "1.3.1",
|
|
150
|
-
"@n8n/client-oauth2": "1.0.0-rc.0",
|
|
151
149
|
"@n8n/config": "2.9.0",
|
|
152
|
-
"@n8n/db": "1.10.2",
|
|
153
|
-
"@n8n/decorators": "1.10.1",
|
|
154
150
|
"@n8n/constants": "0.19.0",
|
|
151
|
+
"@n8n/client-oauth2": "1.0.0-rc.0",
|
|
152
|
+
"@n8n/chat-hub": "1.3.1",
|
|
153
|
+
"@n8n/db": "1.10.2",
|
|
155
154
|
"@n8n/di": "0.10.0",
|
|
155
|
+
"@n8n/decorators": "1.10.1",
|
|
156
156
|
"@n8n/n8n-nodes-langchain": "2.10.1",
|
|
157
|
-
"@n8n/permissions": "0.51.0",
|
|
158
|
-
"@n8n/syslog-client": "1.2.0",
|
|
159
157
|
"@n8n/errors": "0.6.0",
|
|
160
|
-
"@n8n/
|
|
161
|
-
"n8n-core": "2.10.1",
|
|
162
|
-
"n8n-editor-ui": "2.10.2",
|
|
158
|
+
"@n8n/permissions": "0.51.0",
|
|
163
159
|
"@n8n/task-runner": "2.10.1",
|
|
164
160
|
"@n8n/utils": "1.25.0",
|
|
161
|
+
"@n8n/workflow-sdk": "0.3.1",
|
|
162
|
+
"@n8n/syslog-client": "1.2.0",
|
|
163
|
+
"n8n-editor-ui": "2.10.3",
|
|
164
|
+
"n8n-nodes-base": "2.10.1",
|
|
165
165
|
"n8n-workflow": "2.10.1",
|
|
166
|
-
"n8n-
|
|
166
|
+
"n8n-core": "2.10.1"
|
|
167
167
|
},
|
|
168
168
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
169
169
|
"homepage": "https://n8n.io",
|