n8n 2.9.2 → 2.10.1

package/dist/collaboration/collaboration.message.d.ts

@@ -23,12 +23,15 @@ export declare const workflowClosedMessageSchema: z.ZodObject<{
 export declare const writeAccessRequestedMessageSchema: z.ZodObject<{
     type: z.ZodLiteral<"writeAccessRequested">;
     workflowId: z.ZodString;
+    force: z.ZodOptional<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
     type: "writeAccessRequested";
     workflowId: string;
+    force?: boolean | undefined;
 }, {
     type: "writeAccessRequested";
     workflowId: string;
+    force?: boolean | undefined;
 }>;
 export declare const writeAccessReleaseRequestedMessageSchema: z.ZodObject<{
     type: z.ZodLiteral<"writeAccessReleaseRequested">;
@@ -71,12 +74,15 @@ export declare const workflowMessageSchema: z.ZodDiscriminatedUnion<"type", [z.Z
 }>, z.ZodObject<{
     type: z.ZodLiteral<"writeAccessRequested">;
     workflowId: z.ZodString;
+    force: z.ZodOptional<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
     type: "writeAccessRequested";
     workflowId: string;
+    force?: boolean | undefined;
 }, {
     type: "writeAccessRequested";
     workflowId: string;
+    force?: boolean | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"writeAccessReleaseRequested">;
     workflowId: z.ZodString;
@@ -111,6 +117,7 @@ export declare const parseWorkflowMessage: (msg: unknown) => Promise<{
 } | {
     type: "writeAccessRequested";
     workflowId: string;
+    force?: boolean | undefined;
 } | {
     type: "writeAccessReleaseRequested";
     workflowId: string;

package/dist/collaboration/collaboration.message.js

@@ -18,6 +18,7 @@ exports.writeAccessRequestedMessageSchema = zod_1.z
     .object({
     type: zod_1.z.literal('writeAccessRequested'),
     workflowId: zod_1.z.string().min(1),
+    force: zod_1.z.boolean().optional(),
 })
     .strict();
 exports.writeAccessReleaseRequestedMessageSchema = zod_1.z

package/dist/collaboration/collaboration.message.js.map

@@ -1 +1 @@
-{"version":3,"file":"collaboration.message.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.message.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AASX,QAAA,2BAA2B,GAAG,OAAC;KAC1C,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IACjC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,2BAA2B,GAAG,OAAC;KAC1C,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IACjC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,iCAAiC,GAAG,OAAC;KAChD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC;IACvC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,wCAAwC,GAAG,OAAC;KACvD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,6BAA6B,CAAC;IAC9C,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,iCAAiC,GAAG,OAAC;KAChD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC;IACvC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,qBAAqB,GAAG,OAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACjE,mCAA2B;IAC3B,mCAA2B;IAC3B,yCAAiC;IACjC,gDAAwC;IACxC,yCAAiC;CACjC,CAAC,CAAC;AAmBI,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAY,EAAE,EAAE;IAC1D,OAAO,MAAM,6BAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AACpD,CAAC,CAAC;AAFW,QAAA,oBAAoB,wBAE/B"}
+{"version":3,"file":"collaboration.message.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.message.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AASX,QAAA,2BAA2B,GAAG,OAAC;KAC1C,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IACjC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,2BAA2B,GAAG,OAAC;KAC1C,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IACjC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,iCAAiC,GAAG,OAAC;KAChD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC;IACvC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,KAAK,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,wCAAwC,GAAG,OAAC;KACvD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,6BAA6B,CAAC;IAC9C,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,iCAAiC,GAAG,OAAC;KAChD,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC;IACvC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,qBAAqB,GAAG,OAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACjE,mCAA2B;IAC3B,mCAA2B;IAC3B,yCAAiC;IACjC,gDAAwC;IACxC,yCAAiC;CACjC,CAAC,CAAC;AAmBI,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAY,EAAE,EAAE;IAC1D,OAAO,MAAM,6BAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AACpD,CAAC,CAAC;AAFW,QAAA,oBAAoB,wBAE/B"}

package/dist/collaboration/collaboration.service.d.ts

@@ -13,7 +13,7 @@ export declare class CollaborationService {
     private readonly accessService;
     constructor(errorReporter: ErrorReporter, push: Push, state: CollaborationState, userRepository: UserRepository, accessService: AccessService);
     init(): void;
-    handleUserMessage(userId: User['id'], msg: unknown): Promise<void>;
+    handleUserMessage(userId: User['id'], clientId: string, msg: unknown): Promise<void>;
     private handleWorkflowOpened;
     private handleWorkflowClosed;
     private sendWorkflowUsersChangedMessage;
@@ -23,6 +23,9 @@ export declare class CollaborationService {
     private sendWriteAccessAcquiredMessage;
     private sendWriteAccessReleasedMessage;
     broadcastWorkflowUpdate(workflowId: Workflow['id'], updatedByUserId: User['id']): Promise<void>;
-    getWriteLock(userId: User['id'], workflowId: Workflow['id']): Promise<User['id'] | null>;
-    validateWriteLock(userId: User['id'], workflowId: Workflow['id'], action: string): Promise<void>;
+    getWriteLock(userId: User['id'], workflowId: Workflow['id']): Promise<{
+        clientId: string;
+        userId: string;
+    } | null>;
+    validateWriteLock(userId: User['id'], clientId: string | undefined, workflowId: Workflow['id'], action: string): Promise<void>;
 }

package/dist/collaboration/collaboration.service.js

@@ -16,7 +16,8 @@ const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const collaboration_message_1 = require("./collaboration.message");
 const collaboration_state_1 = require("../collaboration/collaboration.state");
-const forbidden_error_1 = require("../errors/response-errors/forbidden.error");
+const conflict_error_1 = require("../errors/response-errors/conflict.error");
+const locked_error_1 = require("../errors/response-errors/locked.error");
 const push_1 = require("../push");
 const access_service_1 = require("../services/access.service");
 let CollaborationService = class CollaborationService {
@@ -30,56 +31,57 @@ let CollaborationService = class CollaborationService {
     init() {
         this.push.on('message', async (event) => {
             try {
-                await this.handleUserMessage(event.userId, event.msg);
+                await this.handleUserMessage(event.userId, event.pushRef, event.msg);
             }
             catch (error) {
                 this.errorReporter.error(new n8n_workflow_1.UnexpectedError('Error handling CollaborationService push message', {
                     extra: {
                         msg: event.msg,
                         userId: event.userId,
+                        pushRef: event.pushRef,
                     },
                     cause: error,
                 }));
             }
         });
     }
-    async handleUserMessage(userId, msg) {
+    async handleUserMessage(userId, clientId, msg) {
         const workflowMessage = await (0, collaboration_message_1.parseWorkflowMessage)(msg);
         if (workflowMessage.type === 'workflowOpened') {
-            await this.handleWorkflowOpened(userId, workflowMessage);
+            await this.handleWorkflowOpened(userId, clientId, workflowMessage);
         }
         else if (workflowMessage.type === 'workflowClosed') {
-            await this.handleWorkflowClosed(userId, workflowMessage);
+            await this.handleWorkflowClosed(userId, clientId, workflowMessage);
         }
         else if (workflowMessage.type === 'writeAccessRequested') {
-            await this.handleWriteAccessRequested(userId, workflowMessage);
+            await this.handleWriteAccessRequested(userId, clientId, workflowMessage);
         }
         else if (workflowMessage.type === 'writeAccessReleaseRequested') {
-            await this.handleWriteAccessReleaseRequested(userId, workflowMessage);
+            await this.handleWriteAccessReleaseRequested(userId, clientId, workflowMessage);
         }
         else if (workflowMessage.type === 'writeAccessHeartbeat') {
-            await this.handleWriteAccessHeartbeat(userId, workflowMessage);
+            await this.handleWriteAccessHeartbeat(userId, clientId, workflowMessage);
         }
     }
-    async handleWorkflowOpened(userId, msg) {
+    async handleWorkflowOpened(userId, clientId, msg) {
         const { workflowId } = msg;
         if (!(await this.accessService.hasReadAccess(userId, workflowId))) {
             return;
         }
-        await this.state.addCollaborator(workflowId, userId);
+        await this.state.addCollaborator(workflowId, userId, clientId);
         await this.sendWorkflowUsersChangedMessage(workflowId);
     }
-    async handleWorkflowClosed(userId, msg) {
+    async handleWorkflowClosed(userId, clientId, msg) {
         const { workflowId } = msg;
         if (!(await this.accessService.hasReadAccess(userId, workflowId))) {
             return;
         }
-        const currentLockHolder = await this.state.getWriteLock(workflowId);
-        if (currentLockHolder === userId) {
+        const currentLock = await this.state.getWriteLock(workflowId);
+        if (currentLock?.clientId === clientId) {
             await this.state.releaseWriteLock(workflowId);
             await this.sendWriteAccessReleasedMessage(workflowId);
         }
-        await this.state.removeCollaborator(workflowId, userId);
+        await this.state.removeCollaborator(workflowId, clientId);
         await this.sendWorkflowUsersChangedMessage(workflowId);
     }
     async sendWorkflowUsersChangedMessage(workflowId) {
@@ -99,32 +101,40 @@ let CollaborationService = class CollaborationService {
         };
         this.push.sendToUsers({ type: 'collaboratorsChanged', data: msgData }, userIds);
     }
-    async handleWriteAccessRequested(userId, msg) {
-        const { workflowId } = msg;
+    async handleWriteAccessRequested(userId, clientId, msg) {
+        const { workflowId, force } = msg;
         if (!(await this.accessService.hasWriteAccess(userId, workflowId))) {
             return;
         }
-        const currentLockHolder = await this.state.getWriteLock(workflowId);
-        if (currentLockHolder && currentLockHolder !== userId) {
-            return;
+        if (force) {
+            const acquired = await this.state.acquireWriteLockForce(workflowId, clientId, userId);
+            if (!acquired) {
+                return;
+            }
         }
-        await this.state.setWriteLock(workflowId, userId);
-        await this.sendWriteAccessAcquiredMessage(workflowId, userId);
+        else {
+            const currentLock = await this.state.getWriteLock(workflowId);
+            if (currentLock && currentLock.clientId !== clientId) {
+                return;
+            }
+            await this.state.setWriteLock(workflowId, clientId, userId);
+        }
+        await this.sendWriteAccessAcquiredMessage(workflowId, userId, clientId);
     }
-    async handleWriteAccessReleaseRequested(userId, msg) {
+    async handleWriteAccessReleaseRequested(_userId, clientId, msg) {
         const { workflowId } = msg;
-        const currentLockHolder = await this.state.getWriteLock(workflowId);
-        if (currentLockHolder !== userId) {
+        const currentLock = await this.state.getWriteLock(workflowId);
+        if (currentLock?.clientId !== clientId) {
             return;
         }
         await this.state.releaseWriteLock(workflowId);
         await this.sendWriteAccessReleasedMessage(workflowId);
     }
-    async handleWriteAccessHeartbeat(userId, msg) {
+    async handleWriteAccessHeartbeat(_userId, clientId, msg) {
         const { workflowId } = msg;
-        await this.state.renewWriteLock(workflowId, userId);
+        await this.state.renewWriteLock(workflowId, clientId);
     }
-    async sendWriteAccessAcquiredMessage(workflowId, userId) {
+    async sendWriteAccessAcquiredMessage(workflowId, userId, clientId) {
         const collaborators = await this.state.getCollaborators(workflowId);
         const userIds = collaborators.map((user) => user.userId);
         if (userIds.length === 0) {
@@ -133,6 +143,7 @@ let CollaborationService = class CollaborationService {
         const msgData = {
             workflowId,
             userId,
+            clientId,
         };
         this.push.sendToUsers({ type: 'writeAccessAcquired', data: msgData }, userIds);
     }
@@ -149,9 +160,7 @@ let CollaborationService = class CollaborationService {
     }
     async broadcastWorkflowUpdate(workflowId, updatedByUserId) {
         const collaborators = await this.state.getCollaborators(workflowId);
-        const userIds = collaborators
-            .map((user) => user.userId)
-            .filter((userId) => userId !== updatedByUserId);
+        const userIds = collaborators.map((user) => user.userId);
         if (userIds.length === 0) {
             return;
         }
@@ -167,10 +176,22 @@ let CollaborationService = class CollaborationService {
         }
         return await this.state.getWriteLock(workflowId);
     }
-    async validateWriteLock(userId, workflowId, action) {
-        const writeLockHolder = await this.getWriteLock(userId, workflowId);
-        if (writeLockHolder && writeLockHolder !== userId) {
-            throw new forbidden_error_1.ForbiddenError(`Cannot ${action} workflow - another user currently has write access`);
+    async validateWriteLock(userId, clientId, workflowId, action) {
+        if (!clientId) {
+            return;
+        }
+        const lock = await this.state.getWriteLock(workflowId);
+        if (!lock) {
+            return;
+        }
+        if (lock.clientId === clientId) {
+            return;
+        }
+        if (lock.userId === userId) {
+            throw new conflict_error_1.ConflictError(`Cannot ${action} workflow - you have this workflow open in another tab`);
+        }
+        else {
+            throw new locked_error_1.LockedError(`Cannot ${action} workflow - another user currently has write access`);
         }
     }
 };

package/dist/collaboration/collaboration.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"collaboration.service.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.service.ts"],"names":[],"mappings":"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"}
+{"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;QAJ5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,SAAI,GAAJ,IAAI,CAAM;QACV,UAAK,GAAL,KAAK,CAAoB;QACzB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,kBAAa,GAAb,aAAa,CAAe;IAC3C,CAAC;IAEJ,IAAI;QACH,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,KAAoB,EAAE,EAAE;YACtD,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;YACtE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,aAAa,CAAC,KAAK,CACvB,IAAI,8BAAe,CAAC,kDAAkD,EAAE;oBACvE,KAAK,EAAE;wBACN,GAAG,EAAE,KAAK,CAAC,GAAG;wBACd,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;qBACtB;oBACD,KAAK,EAAE,KAAK;iBACZ,CAAC,CACF,CAAC;YACH,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,MAAkB,EAAE,QAAgB,EAAE,GAAY;QACzE,MAAM,eAAe,GAAG,MAAM,IAAA,4CAAoB,EAAC,GAAG,CAAC,CAAC;QAExD,IAAI,eAAe,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAC/C,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QACpE,CAAC;aAAM,IAAI,eAAe,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACtD,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QACpE,CAAC;aAAM,IAAI,eAAe,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;YAC5D,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QAC1E,CAAC;aAAM,IAAI,eAAe,CAAC,IAAI,KAAK,6BAA6B,EAAE,CAAC;YACnE,MAAM,IAAI,CAAC,iCAAiC,CAAC,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QACjF,CAAC;aAAM,IAAI,eAAe,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;YAC5D,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QAC1E,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,oBAAoB,CACjC,MAAkB,EAClB,QAAgB,EAChB,GAA0B;QAE1B,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;QAE3B,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YACnE,OAAO;QACR,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE/D,MAAM,IAAI,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC;IACxD,CAAC;IAEO,KAAK,CAAC,oBAAoB,CACjC,MAAkB,EAClB,QAAgB,EAChB,GAA0B;QAE1B,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;QAE3B,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YACnE,OAAO;QACR,CAAC;QAGD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9D,IAAI,WAAW,EAAE,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACxC,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,8BAA8B,CAAC,UAAU,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE1D,MAAM,IAAI,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC;IACxD,CAAC;IAEO,KAAK,CAAC,+BAA+B,CAAC,UAA0B;QAGvE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO;QACR,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvF,MAAM,mBAAmB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAChD,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;YACpB,QAAQ,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAE,CAAC,QAAQ;SAC1E,CAAC,CAAC,CAAC;QACJ,MAAM,OAAO,GAAwC;YACpD,UAAU;YACV,aAAa,EAAE,mBAAmB;SAClC,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IACjF,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACvC,MAAkB,EAClB,QAAgB,EAChB,GAAgC;QAEhC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QAElC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YACpE,OAAO;QACR,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YACtF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO;YACR,CAAC;QACF,CAAC;aAAM,CAAC;YACP,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAC9D,IAAI,WAAW,IAAI,WAAW,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACtD,OAAO;YACR,CAAC;YAED,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,IAAI,CAAC,8BAA8B,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACzE,CAAC;IAEO,KAAK,CAAC,iCAAiC,CAC9C,OAAmB,EACnB,QAAgB,EAChB,GAAuC;QAEvC,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;QAE3B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE9D,IAAI,WAAW,EAAE,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACxC,OAAO;QACR,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,8BAA8B,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAEO,KAAK,CAAC,0BAA0B,CACvC,OAAmB,EACnB,QAAgB,EAChB,GAAgC;QAEhC,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;QAG3B,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAC3C,UAA0B,EAC1B,MAAkB,EAClB,QAAgB;QAEhB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO;QACR,CAAC;QAED,MAAM,OAAO,GAAuC;YACnD,UAAU;YACV,MAAM;YACN,QAAQ;SACR,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAChF,CAAC;IAEO,KAAK,CAAC,8BAA8B,CAAC,UAA0B;QACtE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO;QACR,CAAC;QAED,MAAM,OAAO,GAAuC;YACnD,UAAU;SACV,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,UAA0B,EAAE,eAA2B;QACpF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACpE,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO;QACR,CAAC;QAED,MAAM,OAAO,GAAmC;YAC/C,UAAU;YACV,MAAM,EAAE,eAAe;SACvB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAOD,KAAK,CAAC,YAAY,CACjB,MAAkB,EAClB,UAA0B;QAE1B,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YACnE,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAClD,CAAC;IAOD,KAAK,CAAC,iBAAiB,CACtB,MAAkB,EAClB,QAA4B,EAC5B,UAA0B,EAC1B,MAAc;QAEd,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,OAAO;QACR,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEvD,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,OAAO;QACR,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO;QACR,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAE5B,MAAM,IAAI,8BAAa,CACtB,UAAU,MAAM,wDAAwD,CACxE,CAAC;QACH,CAAC;aAAM,CAAC;YAEP,MAAM,IAAI,0BAAW,CAAC,UAAU,MAAM,qDAAqD,CAAC,CAAC;QAC9F,CAAC;IACF,CAAC;CACD,CAAA;AAxQY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,YAAO,GAAE;qCAGwB,wBAAa;QACtB,WAAI;QACH,wCAAkB;QACT,mBAAc;QACf,8BAAa;GANlC,oBAAoB,CAwQhC"}

package/dist/collaboration/collaboration.state.d.ts

@@ -4,13 +4,14 @@ import { CacheService } from '../services/cache/cache.service';
 interface CacheEntry {
     userId: string;
     lastSeen: string;
+    clientId: string;
 }
 export declare class CollaborationState {
     private readonly cache;
     readonly inactivityCleanUpTime: number;
     constructor(cache: CacheService);
-    addCollaborator(workflowId: Workflow['id'], userId: User['id']): Promise<void>;
-    removeCollaborator(workflowId: Workflow['id'], userId: User['id']): Promise<void>;
+    addCollaborator(workflowId: Workflow['id'], userId: User['id'], clientId: string): Promise<void>;
+    removeCollaborator(workflowId: Workflow['id'], clientId: string): Promise<void>;
     getCollaborators(workflowId: Workflow['id']): Promise<CacheEntry[]>;
     private formWorkflowCacheKey;
     private splitToExpiredAndStillActive;
@@ -18,10 +19,14 @@ export declare class CollaborationState {
     private cacheHashToCollaborators;
     private hasSessionExpired;
     readonly writeLockTtl: number;
-    setWriteLock(workflowId: Workflow['id'], userId: User['id']): Promise<void>;
-    renewWriteLock(workflowId: Workflow['id'], userId: User['id']): Promise<void>;
-    getWriteLock(workflowId: Workflow['id']): Promise<User['id'] | null>;
+    setWriteLock(workflowId: Workflow['id'], clientId: string, userId: User['id']): Promise<void>;
+    renewWriteLock(workflowId: Workflow['id'], clientId: string): Promise<void>;
+    getWriteLock(workflowId: Workflow['id']): Promise<{
+        clientId: string;
+        userId: string;
+    } | null>;
     releaseWriteLock(workflowId: Workflow['id']): Promise<void>;
     private formWriteLockCacheKey;
+    acquireWriteLockForce(workflowId: Workflow['id'], clientId: string, userId: User['id']): Promise<boolean>;
 }
 export {};

package/dist/collaboration/collaboration.state.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollaborationState = void 0;
 const constants_1 = require("@n8n/constants");
 const di_1 = require("@n8n/di");
+const n8n_workflow_1 = require("n8n-workflow");
 const cache_service_1 = require("../services/cache/cache.service");
 let CollaborationState = class CollaborationState {
     constructor(cache) {
@@ -19,16 +20,16 @@ let CollaborationState = class CollaborationState {
         this.inactivityCleanUpTime = 15 * constants_1.Time.minutes.toMilliseconds;
         this.writeLockTtl = 2 * constants_1.Time.minutes.toMilliseconds;
     }
-    async addCollaborator(workflowId, userId) {
+    async addCollaborator(workflowId, userId, clientId) {
         const cacheKey = this.formWorkflowCacheKey(workflowId);
         const cacheEntry = {
-            [userId]: new Date().toISOString(),
+            [clientId]: `${userId}|${new Date().toISOString()}`,
         };
         await this.cache.setHash(cacheKey, cacheEntry);
     }
-    async removeCollaborator(workflowId, userId) {
+    async removeCollaborator(workflowId, clientId) {
         const cacheKey = this.formWorkflowCacheKey(workflowId);
-        await this.cache.deleteFromHash(cacheKey, userId);
+        await this.cache.deleteFromHash(cacheKey, clientId);
     }
     async getCollaborators(workflowId) {
         const cacheKey = this.formWorkflowCacheKey(workflowId);
@@ -41,7 +42,14 @@ let CollaborationState = class CollaborationState {
         if (expired.length > 0) {
             void this.removeExpiredCollaborators(workflowId, expired);
         }
-        return stillActive;
+        const userMap = new Map();
+        for (const entry of stillActive) {
+            const existing = userMap.get(entry.userId);
+            if (!existing || new Date(entry.lastSeen) > new Date(existing.lastSeen)) {
+                userMap.set(entry.userId, entry);
+            }
+        }
+        return Array.from(userMap.values());
     }
     formWorkflowCacheKey(workflowId) {
         return `collaboration:${workflowId}`;
@@ -59,35 +67,50 @@ let CollaborationState = class CollaborationState {
         }
         return [expired, stillActive];
     }
-    async removeExpiredCollaborators(workflowId, expiredUsers) {
+    async removeExpiredCollaborators(workflowId, expiredClients) {
         const cacheKey = this.formWorkflowCacheKey(workflowId);
-        await Promise.all(expiredUsers.map(async (user) => await this.cache.deleteFromHash(cacheKey, user.userId)));
+        await Promise.all(expiredClients.map(async (client) => await this.cache.deleteFromHash(cacheKey, client.clientId)));
     }
     cacheHashToCollaborators(workflowCacheEntry) {
-        return Object.entries(workflowCacheEntry).map(([userId, lastSeen]) => ({
-            userId,
-            lastSeen,
-        }));
+        return Object.entries(workflowCacheEntry).map(([clientId, value]) => {
+            const [userId, lastSeen] = value.split('|');
+            return {
+                userId,
+                lastSeen,
+                clientId,
+            };
+        });
     }
     hasSessionExpired(lastSeenString) {
         const expiryTime = new Date(lastSeenString).getTime() + this.inactivityCleanUpTime;
         return Date.now() > expiryTime;
     }
-    async setWriteLock(workflowId, userId) {
+    async setWriteLock(workflowId, clientId, userId) {
         const cacheKey = this.formWriteLockCacheKey(workflowId);
-        await this.cache.set(cacheKey, userId, this.writeLockTtl);
+        const lockData = JSON.stringify({ clientId, userId });
+        await this.cache.set(cacheKey, lockData, this.writeLockTtl);
     }
-    async renewWriteLock(workflowId, userId) {
+    async renewWriteLock(workflowId, clientId) {
         const cacheKey = this.formWriteLockCacheKey(workflowId);
-        const currentHolder = await this.getWriteLock(workflowId);
-        if (currentHolder === userId) {
-            await this.cache.set(cacheKey, userId, this.writeLockTtl);
+        const currentLock = await this.getWriteLock(workflowId);
+        if (currentLock?.clientId === clientId) {
+            const lockData = JSON.stringify(currentLock);
+            await this.cache.set(cacheKey, lockData, this.writeLockTtl);
         }
     }
     async getWriteLock(workflowId) {
         const cacheKey = this.formWriteLockCacheKey(workflowId);
-        const userId = await this.cache.get(cacheKey);
-        return userId ?? null;
+        const lockData = await this.cache.get(cacheKey);
+        if (!lockData) {
+            return null;
+        }
+        const parsed = (0, n8n_workflow_1.jsonParse)(lockData, {
+            fallbackValue: null,
+        });
+        if (!parsed?.clientId || !parsed?.userId) {
+            return null;
+        }
+        return parsed;
     }
     async releaseWriteLock(workflowId) {
         const cacheKey = this.formWriteLockCacheKey(workflowId);
@@ -96,6 +119,14 @@ let CollaborationState = class CollaborationState {
     formWriteLockCacheKey(workflowId) {
         return `collaboration:write-lock:${workflowId}`;
     }
+    async acquireWriteLockForce(workflowId, clientId, userId) {
+        const currentLock = await this.getWriteLock(workflowId);
+        if (currentLock && currentLock.userId !== userId) {
+            return false;
+        }
+        await this.setWriteLock(workflowId, clientId, userId);
+        return true;
+    }
 };
 exports.CollaborationState = CollaborationState;
 exports.CollaborationState = CollaborationState = __decorate([

package/dist/collaboration/collaboration.state.js.map

@@ -1 +1 @@
-{"version":3,"file":"collaboration.state.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collaboration.state.js","sourceRoot":"","sources":["../../src/collaboration/collaboration.state.ts"],"names":[],"mappings":"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"}

package/dist/commands/base-command.js

@@ -56,6 +56,7 @@ const community_packages_config_1 = require("../modules/community-packages/commu
 const node_types_1 = require("../node-types");
 const posthog_1 = require("../posthog");
 const shutdown_service_1 = require("../shutdown/shutdown.service");
+const health_endpoint_util_1 = require("../utils/health-endpoint.util");
 const workflow_history_manager_1 = require("../workflows/workflow-history/workflow-history-manager");
 const load_nodes_and_credentials_1 = require("../load-nodes-and-credentials");
 class BaseCommand {
@@ -86,7 +87,7 @@ class BaseCommand {
             eventLoopBlockThreshold,
             tracesSampleRate,
             profilesSampleRate,
-            healthEndpoint: this.globalConfig.endpoints.health,
+            healthEndpoint: (0, health_endpoint_util_1.resolveHealthEndpointPath)(this.globalConfig),
             eligibleIntegrations: {
                 Express: true,
                 Http: true,
@@ -109,9 +110,6 @@ class BaseCommand {
         await this.dbConnection
             .migrate()
             .catch(async (error) => await this.exitWithCrash('There was an error running database migrations', error));
-        if (this.instanceSettings.instanceType === 'main') {
-            await di_1.Container.get(db_1.AuthRolesService).init();
-        }
         if (process.env.EXECUTIONS_PROCESS === 'own')
             process.exit(-1);
         if (this.globalConfig.executions.mode === 'queue' &&

package/dist/commands/base-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"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"}

package/dist/commands/export/credentials.d.ts

@@ -13,16 +13,16 @@ declare const flagsSchema: z.ZodObject<{
     id?: string | undefined;
     all?: boolean | undefined;
     separate?: boolean | undefined;
-    backup?: boolean | undefined;
     pretty?: boolean | undefined;
+    backup?: boolean | undefined;
     decrypted?: boolean | undefined;
 }, {
     output?: string | undefined;
     id?: string | undefined;
     all?: boolean | undefined;
     separate?: boolean | undefined;
-    backup?: boolean | undefined;
     pretty?: boolean | undefined;
+    backup?: boolean | undefined;
     decrypted?: boolean | undefined;
 }>;
 export declare class ExportCredentialsCommand extends BaseCommand<z.infer<typeof flagsSchema>> {

package/dist/commands/export/workflow.d.ts

@@ -16,18 +16,18 @@ declare const flagsSchema: z.ZodObject<{
     id?: string | undefined;
     all?: boolean | undefined;
     separate?: boolean | undefined;
+    pretty?: boolean | undefined;
     published?: boolean | undefined;
     backup?: boolean | undefined;
-    pretty?: boolean | undefined;
 }, {
     output?: string | undefined;
     version?: string | undefined;
     id?: string | undefined;
     all?: boolean | undefined;
     separate?: boolean | undefined;
+    pretty?: boolean | undefined;
     published?: boolean | undefined;
     backup?: boolean | undefined;
-    pretty?: boolean | undefined;
 }>;
 export declare class ExportWorkflowsCommand extends BaseCommand<z.infer<typeof flagsSchema>> {
     run(): Promise<void>;

package/dist/commands/start.js

@@ -198,6 +198,10 @@ let Start = class Start extends base_command_1.BaseCommand {
         if (isMultiMainEnabled && !this.license.isMultiMainLicensed()) {
             throw new feature_not_licensed_error_1.FeatureNotLicensedError(constants_1.LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
         }
+        if (this.instanceSettings.instanceType === 'main' &&
+            (!this.instanceSettings.isMultiMain || this.instanceSettings.isLeader)) {
+            await di_1.Container.get(db_1.AuthRolesService).init();
+        }
         di_1.Container.get(wait_tracker_1.WaitTracker).init();
         this.logger.debug('Wait tracker init complete');
         await di_1.Container.get(credentials_overwrites_1.CredentialsOverwrites).init();