n8n 1.56.2 → 1.58.0

package/dist/public-api/v1/shared/middlewares/global.middleware.d.ts

@@ -0,0 +1,15 @@
+import type express from 'express';
+import type { AuthenticatedRequest } from '../../../../requests';
+import type { PaginatedRequest } from '../../../types';
+import type { Scope } from '@n8n/permissions';
+import type { BooleanLicenseFeature } from '../../../../interfaces';
+export type ProjectScopeResource = 'workflow' | 'credential';
+export declare const globalScope: (scopes: Scope | Scope[]) => (req: AuthenticatedRequest<{
+    id?: string;
+}>, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>;
+export declare const projectScope: (scopes: Scope | Scope[], resource: ProjectScopeResource) => (req: AuthenticatedRequest<{
+    id?: string;
+}>, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>;
+export declare const validCursor: (req: PaginatedRequest, res: express.Response, next: express.NextFunction) => express.Response | void;
+export declare const validLicenseWithUserQuota: (_: express.Request, res: express.Response, next: express.NextFunction) => express.Response | void;
+export declare const isLicensed: (feature: BooleanLicenseFeature) => (_: AuthenticatedRequest, res: express.Response, next: express.NextFunction) => Promise<void | express.Response<any, Record<string, any>>>;

package/dist/public-api/v1/shared/middlewares/global.middleware.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLicensed = exports.validLicenseWithUserQuota = exports.validCursor = exports.projectScope = exports.globalScope = void 0;
+const typedi_1 = require("typedi");
+const license_1 = require("../../../../license");
+const pagination_service_1 = require("../services/pagination.service");
+const check_access_1 = require("../../../../permissions/check-access");
+const feature_not_licensed_error_1 = require("../../../../errors/feature-not-licensed.error");
+const UNLIMITED_USERS_QUOTA = -1;
+const buildScopeMiddleware = (scopes, resource, { globalOnly } = { globalOnly: false }) => {
+    return async (req, res, next) => {
+        const params = {};
+        if (req.params.id) {
+            if (resource === 'workflow') {
+                params.workflowId = req.params.id;
+            }
+            else if (resource === 'credential') {
+                params.credentialId = req.params.id;
+            }
+        }
+        if (!(await (0, check_access_1.userHasScope)(req.user, scopes, globalOnly, params))) {
+            return res.status(403).json({ message: 'Forbidden' });
+        }
+        return next();
+    };
+};
+const globalScope = (scopes) => buildScopeMiddleware(Array.isArray(scopes) ? scopes : [scopes], undefined, { globalOnly: true });
+exports.globalScope = globalScope;
+const projectScope = (scopes, resource) => buildScopeMiddleware(Array.isArray(scopes) ? scopes : [scopes], resource, { globalOnly: false });
+exports.projectScope = projectScope;
+const validCursor = (req, res, next) => {
+    if (req.query.cursor) {
+        const { cursor } = req.query;
+        try {
+            const paginationData = (0, pagination_service_1.decodeCursor)(cursor);
+            if ('offset' in paginationData) {
+                req.query.offset = paginationData.offset;
+                req.query.limit = paginationData.limit;
+            }
+            else {
+                req.query.lastId = paginationData.lastId;
+                req.query.limit = paginationData.limit;
+            }
+        }
+        catch (error) {
+            return res.status(400).json({
+                message: 'An invalid cursor was provided',
+            });
+        }
+    }
+    return next();
+};
+exports.validCursor = validCursor;
+const validLicenseWithUserQuota = (_, res, next) => {
+    const license = typedi_1.Container.get(license_1.License);
+    if (license.getUsersLimit() !== UNLIMITED_USERS_QUOTA) {
+        return res.status(403).json({
+            message: '/users path can only be used with a valid license. See https://n8n.io/pricing/',
+        });
+    }
+    return next();
+};
+exports.validLicenseWithUserQuota = validLicenseWithUserQuota;
+const isLicensed = (feature) => {
+    return async (_, res, next) => {
+        if (typedi_1.Container.get(license_1.License).isFeatureEnabled(feature))
+            return next();
+        return res.status(403).json({ message: new feature_not_licensed_error_1.FeatureNotLicensedError(feature).message });
+    };
+};
+exports.isLicensed = isLicensed;
+//# sourceMappingURL=global.middleware.js.map

package/dist/public-api/v1/shared/middlewares/global.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"global.middleware.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/shared/middlewares/global.middleware.ts"],"names":[],"mappings":"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"}

package/dist/public-api/v1/shared/services/pagination.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.service.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/shared/services/pagination.service.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAQlC,MAAM,YAAY,GAAG,CAAC,MAAc,EAAqD,EAAE;IACjG,OAAO,IAAA,wBAAS,EAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC5D,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEF,MAAM,sBAAsB,GAAG,CAAC,UAA4B,EAAiB,EAAE;IAC9E,IAAI,UAAU,CAAC,oBAAoB,GAAG,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;QAC5E,OAAO,MAAM,CAAC,IAAI,CACjB,IAAI,CAAC,SAAS,CAAC;YACd,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK;SAC5C,CAAC,CACF,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,UAA4B,EAAiB,EAAE;IAC9E,IAAI,UAAU,CAAC,mBAAmB,EAAE,CAAC;QACpC,OAAO,MAAM,CAAC,IAAI,CACjB,IAAI,CAAC,SAAS,CAAC;YACd,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,KAAK,EAAE,UAAU,CAAC,KAAK;SACvB,CAAC,CACF,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAC/B,UAA+C,EAC/B,EAAE;IAClB,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;QAC5B,OAAO,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,sBAAsB,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC,CAAC;AAPW,QAAA,gBAAgB,oBAO3B"}

package/dist/push/abstract.push.d.ts

@@ -1,16 +1,25 @@
-import type { IPushDataType } from '../Interfaces';
-import type { Logger } from '../Logger';
-export declare abstract class AbstractPush<T> {
+import type { IPushDataType } from '../interfaces';
+import type { Logger } from '../logger';
+import type { User } from '../databases/entities/user';
+import { TypedEmitter } from '../typed-emitter';
+import type { OnPushMessage } from '../push/types';
+export interface AbstractPushEvents {
+    message: OnPushMessage;
+}
+export declare abstract class AbstractPush<T> extends TypedEmitter<AbstractPushEvents> {
     protected readonly logger: Logger;
     protected connections: Record<string, T>;
+    protected userIdByPushRef: Record<string, string>;
     protected abstract close(connection: T): void;
     protected abstract sendToOneConnection(connection: T, data: string): void;
     constructor(logger: Logger);
-    protected add(pushRef: string, connection: T): void;
+    protected add(pushRef: string, userId: User['id'], connection: T): void;
+    protected onMessageReceived(pushRef: string, msg: unknown): void;
     protected remove(pushRef?: string): void;
     private sendTo;
     sendToAll(type: IPushDataType, data?: unknown): void;
     sendToOne(type: IPushDataType, data: unknown, pushRef: string): void;
+    sendToUsers(type: IPushDataType, data: unknown, userIds: Array<User['id']>): void;
     closeAllConnections(): void;
     hasPushRef(pushRef: string): boolean;
 }

package/dist/push/abstract.push.js

@@ -2,25 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractPush = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
-class AbstractPush {
+const typed_emitter_1 = require("../typed-emitter");
+class AbstractPush extends typed_emitter_1.TypedEmitter {
     constructor(logger) {
+        super();
         this.logger = logger;
         this.connections = {};
+        this.userIdByPushRef = {};
     }
-    add(pushRef, connection) {
-        const { connections } = this;
+    add(pushRef, userId, connection) {
+        const { connections, userIdByPushRef } = this;
         this.logger.debug('Add editor-UI session', { pushRef });
         const existingConnection = connections[pushRef];
         if (existingConnection) {
             this.close(existingConnection);
         }
         connections[pushRef] = connection;
+        userIdByPushRef[pushRef] = userId;
+    }
+    onMessageReceived(pushRef, msg) {
+        this.logger.debug('Received message from editor-UI', { pushRef, msg });
+        const userId = this.userIdByPushRef[pushRef];
+        this.emit('message', { pushRef, userId, msg });
     }
     remove(pushRef) {
         if (!pushRef)
             return;
         this.logger.debug('Removed editor-UI session', { pushRef });
         delete this.connections[pushRef];
+        delete this.userIdByPushRef[pushRef];
     }
     sendTo(type, data, pushRefs) {
         this.logger.debug(`Send data of type "${type}" to editor-UI`, {
@@ -44,6 +54,11 @@ class AbstractPush {
         }
         this.sendTo(type, data, [pushRef]);
     }
+    sendToUsers(type, data, userIds) {
+        const { connections } = this;
+        const userPushRefs = Object.keys(connections).filter((pushRef) => userIds.includes(this.userIdByPushRef[pushRef]));
+        this.sendTo(type, data, userPushRefs);
+    }
     closeAllConnections() {
         for (const pushRef in this.connections) {
             this.close(this.connections[pushRef]);

package/dist/push/abstract.push.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract.push.js","sourceRoot":"","sources":["../../src/push/abstract.push.ts"],"names":[],"mappings":";;;AAAA,+CAAqD;AAUrD,MAAsB,YAAY;IAMjC,YAA+B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QALnC,gBAAW,GAAsB,EAAE,CAAC;IAKE,CAAC;IAEvC,GAAG,CAAC,OAAe,EAAE,UAAa;QAC3C,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAExD,MAAM,kBAAkB,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QAEhD,IAAI,kBAAkB,EAAE,CAAC;YAExB,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAChC,CAAC;QAED,WAAW,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC;IACnC,CAAC;IAES,MAAM,CAAC,OAAgB;QAChC,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAE5D,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEO,MAAM,CAAC,IAAmB,EAAE,IAAa,EAAE,QAAkB;QACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,gBAAgB,EAAE;YAC7D,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;SAC7B,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,IAAA,4BAAa,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;QAExF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAA,qBAAM,EAAC,UAAU,CAAC,CAAC;YACnB,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC;IAED,SAAS,CAAC,IAAmB,EAAE,IAAc;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,SAAS,CAAC,IAAmB,EAAE,IAAa,EAAE,OAAe;QAC5D,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,EAAE,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,OAAO,sBAAsB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9E,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,mBAAmB;QAClB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAKxC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;IAED,UAAU,CAAC,OAAe;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC;IAChD,CAAC;CACD;AAvED,oCAuEC"}
+{"version":3,"file":"abstract.push.js","sourceRoot":"","sources":["../../src/push/abstract.push.ts"],"names":[],"mappings":"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"}

package/dist/push/index.d.ts

@@ -1,22 +1,26 @@
 import type { Server } from 'http';
 import type { Application } from 'express';
-import type { IPushDataType } from '../Interfaces';
+import type { IPushDataType } from '../interfaces';
 import { OrchestrationService } from '../services/orchestration.service';
 import { SSEPush } from './sse.push';
 import { WebSocketPush } from './websocket.push';
-import type { PushResponse, SSEPushRequest, WebSocketPushRequest } from './types';
-import { TypedEmitter } from '../TypedEmitter';
+import type { OnPushMessage, PushResponse, SSEPushRequest, WebSocketPushRequest } from './types';
+import { TypedEmitter } from '../typed-emitter';
+import type { User } from '../databases/entities/user';
 type PushEvents = {
     editorUiConnected: string;
+    message: OnPushMessage;
 };
 export declare class Push extends TypedEmitter<PushEvents> {
     private readonly orchestrationService;
+    isBidirectional: boolean;
     private backend;
     constructor(orchestrationService: OrchestrationService);
     handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse): void;
     broadcast(type: IPushDataType, data?: unknown): void;
     send(type: IPushDataType, data: unknown, pushRef: string): void;
-    getBackend(): SSEPush | WebSocketPush;
+    getBackend(): WebSocketPush | SSEPush;
+    sendToUsers(type: IPushDataType, data: unknown, userIds: Array<User['id']>): void;
     onShutdown(): void;
 }
 export declare const setupPushServer: (restEndpoint: string, server: Server, app: Application) => void;

package/dist/push/index.js

@@ -18,22 +18,25 @@ const ws_1 = require("ws");
 const url_1 = require("url");
 const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../config"));
-const OnShutdown_1 = require("../decorators/OnShutdown");
+const on_shutdown_1 = require("../decorators/on-shutdown");
 const auth_service_1 = require("../auth/auth.service");
 const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
 const orchestration_service_1 = require("../services/orchestration.service");
 const sse_push_1 = require("./sse.push");
 const websocket_push_1 = require("./websocket.push");
-const TypedEmitter_1 = require("../TypedEmitter");
+const typed_emitter_1 = require("../typed-emitter");
 const useWebSockets = config_1.default.getEnv('push.backend') === 'websocket';
-let Push = class Push extends TypedEmitter_1.TypedEmitter {
+let Push = class Push extends typed_emitter_1.TypedEmitter {
     constructor(orchestrationService) {
         super();
         this.orchestrationService = orchestrationService;
+        this.isBidirectional = useWebSockets;
         this.backend = useWebSockets ? typedi_1.Container.get(websocket_push_1.WebSocketPush) : typedi_1.Container.get(sse_push_1.SSEPush);
+        if (useWebSockets)
+            this.backend.on('message', (msg) => this.emit('message', msg));
     }
     handleRequest(req, res) {
-        const { ws, query: { pushRef }, } = req;
+        const { ws, query: { pushRef }, user, } = req;
         if (!pushRef) {
             if (ws) {
                 ws.send('The query parameter "pushRef" is missing!');
@@ -43,10 +46,10 @@ let Push = class Push extends TypedEmitter_1.TypedEmitter {
             throw new bad_request_error_1.BadRequestError('The query parameter "pushRef" is missing!');
         }
         if (req.ws) {
-            this.backend.add(pushRef, req.ws);
+            this.backend.add(pushRef, user.id, req.ws);
         }
         else if (!useWebSockets) {
-            this.backend.add(pushRef, { req, res });
+            this.backend.add(pushRef, user.id, { req, res });
         }
         else {
             res.status(401).send('Unauthorized');
@@ -68,13 +71,16 @@ let Push = class Push extends TypedEmitter_1.TypedEmitter {
     getBackend() {
         return this.backend;
     }
+    sendToUsers(type, data, userIds) {
+        this.backend.sendToUsers(type, data, userIds);
+    }
     onShutdown() {
         this.backend.closeAllConnections();
     }
 };
 exports.Push = Push;
 __decorate([
-    (0, OnShutdown_1.OnShutdown)(),
+    (0, on_shutdown_1.OnShutdown)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)

package/dist/push/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+BAAsC;AAItC,2BAAwC;AACxC,6BAAwC;AACxC,mCAA4C;AAE5C,sDAA8B;AAC9B,wDAAqD;AACrD,sDAAkD;AAClD,kFAA6E;AAE7E,4EAAwE;AAExE,yCAAqC;AACrC,qDAAiD;AAEjD,iDAA8C;AAM9C,MAAM,aAAa,GAAG,gBAAM,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,WAAW,CAAC;AAU7D,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,2BAAwB;IAGjD,YAA6B,oBAA0C;QACtE,KAAK,EAAE,CAAC;QADoB,yBAAoB,GAApB,oBAAoB,CAAsB;QAF/D,YAAO,GAAG,aAAa,CAAC,CAAC,CAAC,kBAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC,CAAC,CAAC,kBAAS,CAAC,GAAG,CAAC,kBAAO,CAAC,CAAC;IAIxF,CAAC;IAED,aAAa,CAAC,GAA0C,EAAE,GAAiB;QAC1E,MAAM,EACL,EAAE,EACF,KAAK,EAAE,EAAE,OAAO,EAAE,GAClB,GAAG,GAAG,CAAC;QAER,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,IAAI,EAAE,EAAE,CAAC;gBACR,EAAE,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;gBACrD,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACf,OAAO;YACR,CAAC;YACD,MAAM,IAAI,mCAAe,CAAC,2CAA2C,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;YACX,IAAI,CAAC,OAAyB,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACtD,CAAC;aAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACrC,OAAO;QACR,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,SAAS,CAAC,IAAmB,EAAE,IAAc;QAC5C,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,IAAmB,EAAE,IAAa,EAAE,OAAe;QAOvD,IAAI,IAAI,CAAC,oBAAoB,CAAC,uBAAuB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5F,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;YAC9C,KAAK,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;YACnF,OAAO;QACR,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAGD,UAAU;QACT,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;IACpC,CAAC;CACD,CAAA;AA9DY,oBAAI;AA2DhB;IADC,IAAA,uBAAU,GAAE;;;;sCAGZ;eA7DW,IAAI;IADhB,IAAA,gBAAO,GAAE;qCAI0C,4CAAoB;GAH3D,IAAI,CA8DhB;AAEM,MAAM,eAAe,GAAG,CAAC,YAAoB,EAAE,MAAc,EAAE,GAAgB,EAAE,EAAE;IACzF,IAAI,aAAa,EAAE,CAAC;QACnB,MAAM,QAAQ,GAAG,IAAI,WAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAA6B,EAAE,MAAc,EAAE,IAAI,EAAE,EAAE;YAC5E,IAAI,IAAA,WAAQ,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,KAAK,IAAI,YAAY,OAAO,EAAE,CAAC;gBAChE,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE;oBACpD,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;oBAEhB,MAAM,QAAQ,GAAG,IAAI,qBAAc,CAAC,OAAO,CAAC,CAAC;oBAC7C,QAAQ,CAAC,SAAS,GAAG,CAAC,UAAU,EAAE,EAAE;wBACnC,IAAI,UAAU,GAAG,GAAG;4BAAE,EAAE,CAAC,KAAK,EAAE,CAAC;wBACjC,OAAO,QAAQ,CAAC;oBACjB,CAAC,CAAC;oBAIF,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC/B,CAAC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC;AArBW,QAAA,eAAe,mBAqB1B;AAEK,MAAM,gBAAgB,GAAG,CAAC,YAAoB,EAAE,GAAgB,EAAE,EAAE;IAC1E,MAAM,QAAQ,GAAG,IAAI,YAAY,OAAO,CAAC;IACzC,MAAM,IAAI,GAAG,kBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC;IAC/C,GAAG,CAAC,GAAG,CACN,QAAQ,EAER,WAAW,CAAC,cAAc,EAC1B,CAAC,GAA0C,EAAE,GAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAC/F,CAAC;AACH,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"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"}

package/dist/push/sse.push.d.ts

@@ -1,7 +1,8 @@
 import SSEChannel from 'sse-channel';
-import { Logger } from '../Logger';
+import { Logger } from '../logger';
 import { AbstractPush } from './abstract.push';
 import type { PushRequest, PushResponse } from './types';
+import type { User } from '../databases/entities/user';
 type Connection = {
     req: PushRequest;
     res: PushResponse;
@@ -10,7 +11,7 @@ export declare class SSEPush extends AbstractPush<Connection> {
     readonly channel: SSEChannel;
     readonly connections: Record<string, Connection>;
     constructor(logger: Logger);
-    add(pushRef: string, connection: Connection): void;
+    add(pushRef: string, userId: User['id'], connection: Connection): void;
     protected close({ res }: Connection): void;
     protected sendToOneConnection(connection: Connection, data: string): void;
 }

package/dist/push/sse.push.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SSEPush = void 0;
 const sse_channel_1 = __importDefault(require("sse-channel"));
 const typedi_1 = require("typedi");
-const Logger_1 = require("../Logger");
+const logger_1 = require("../logger");
 const abstract_push_1 = require("./abstract.push");
 let SSEPush = class SSEPush extends abstract_push_1.AbstractPush {
     constructor(logger) {
@@ -23,12 +23,11 @@ let SSEPush = class SSEPush extends abstract_push_1.AbstractPush {
         this.channel = new sse_channel_1.default();
         this.connections = {};
         this.channel.on('disconnect', (_, { req }) => {
-            var _a;
-            this.remove((_a = req === null || req === void 0 ? void 0 : req.query) === null || _a === void 0 ? void 0 : _a.pushRef);
+            this.remove(req?.query?.pushRef);
         });
     }
-    add(pushRef, connection) {
-        super.add(pushRef, connection);
+    add(pushRef, userId, connection) {
+        super.add(pushRef, userId, connection);
         this.channel.addClient(connection.req, connection.res);
     }
     close({ res }) {
@@ -42,6 +41,6 @@ let SSEPush = class SSEPush extends abstract_push_1.AbstractPush {
 exports.SSEPush = SSEPush;
 exports.SSEPush = SSEPush = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [Logger_1.Logger])
+    __metadata("design:paramtypes", [logger_1.Logger])
 ], SSEPush);
 //# sourceMappingURL=sse.push.js.map

package/dist/push/sse.push.js.map

@@ -1 +1 @@
-{"version":3,"file":"sse.push.js","sourceRoot":"","sources":["../../src/push/sse.push.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8DAAqC;AACrC,mCAAiC;AAEjC,qCAAkC;AAElC,mDAA+C;AAMxC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,4BAAwB;IAKpD,YAAY,MAAc;QACzB,KAAK,CAAC,MAAM,CAAC,CAAC;QALN,YAAO,GAAG,IAAI,qBAAU,EAAE,CAAC;QAE3B,gBAAW,GAA+B,EAAE,CAAC;QAKrD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;;YAC5C,IAAI,CAAC,MAAM,CAAC,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,0CAAE,OAAO,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,UAAsB;QAC1C,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC;IAES,KAAK,CAAC,EAAE,GAAG,EAAc;QAClC,GAAG,CAAC,GAAG,EAAE,CAAC;QACV,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAES,mBAAmB,CAAC,UAAsB,EAAE,IAAY;QACjE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;CACD,CAAA;AA1BY,0BAAO;kBAAP,OAAO;IADnB,IAAA,gBAAO,GAAE;qCAMW,eAAM;GALd,OAAO,CA0BnB"}
+{"version":3,"file":"sse.push.js","sourceRoot":"","sources":["../../src/push/sse.push.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8DAAqC;AACrC,mCAAiC;AAEjC,qCAAkC;AAElC,mDAA+C;AAOxC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,4BAAwB;IAKpD,YAAY,MAAc;QACzB,KAAK,CAAC,MAAM,CAAC,CAAC;QALN,YAAO,GAAG,IAAI,qBAAU,EAAE,CAAC;QAE3B,gBAAW,GAA+B,EAAE,CAAC;QAKrD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;YAC5C,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,MAAkB,EAAE,UAAsB;QAC9D,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC;IAES,KAAK,CAAC,EAAE,GAAG,EAAc;QAClC,GAAG,CAAC,GAAG,EAAE,CAAC;QACV,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAES,mBAAmB,CAAC,UAAsB,EAAE,IAAY;QACjE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;CACD,CAAA;AA1BY,0BAAO;kBAAP,OAAO;IADnB,IAAA,gBAAO,GAAE;qCAMW,eAAM;GALd,OAAO,CA0BnB"}

package/dist/push/types.d.ts

@@ -1,6 +1,7 @@
 import type { Response } from 'express';
 import type { WebSocket } from 'ws';
 import type { AuthenticatedRequest } from '../requests';
+import type { User } from '../databases/entities/user';
 export type PushRequest = AuthenticatedRequest<{}, {}, {}, {
     pushRef: string;
 }>;
@@ -13,3 +14,8 @@ export type WebSocketPushRequest = PushRequest & {
 export type PushResponse = Response & {
     req: PushRequest;
 };
+export interface OnPushMessage {
+    pushRef: string;
+    userId: User['id'];
+    msg: unknown;
+}

package/dist/push/websocket.push.d.ts

@@ -1,9 +1,10 @@
 import type WebSocket from 'ws';
-import { Logger } from '../Logger';
+import { Logger } from '../logger';
 import { AbstractPush } from './abstract.push';
+import type { User } from '../databases/entities/user';
 export declare class WebSocketPush extends AbstractPush<WebSocket> {
     constructor(logger: Logger);
-    add(pushRef: string, connection: WebSocket): void;
+    add(pushRef: string, userId: User['id'], connection: WebSocket): void;
     protected close(connection: WebSocket): void;
     protected sendToOneConnection(connection: WebSocket, data: string): void;
     private pingAll;

package/dist/push/websocket.push.js

@@ -11,8 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketPush = void 0;
 const typedi_1 = require("typedi");
-const Logger_1 = require("../Logger");
+const logger_1 = require("../logger");
 const abstract_push_1 = require("./abstract.push");
+const n8n_workflow_1 = require("n8n-workflow");
 function heartbeat() {
     this.isAlive = true;
 }
@@ -21,14 +22,36 @@ let WebSocketPush = class WebSocketPush extends abstract_push_1.AbstractPush {
         super(logger);
         setInterval(() => this.pingAll(), 60 * 1000);
     }
-    add(pushRef, connection) {
+    add(pushRef, userId, connection) {
         connection.isAlive = true;
         connection.on('pong', heartbeat);
-        super.add(pushRef, connection);
+        super.add(pushRef, userId, connection);
+        const onMessage = (data) => {
+            try {
+                const buffer = Array.isArray(data) ? Buffer.concat(data) : Buffer.from(data);
+                this.onMessageReceived(pushRef, JSON.parse(buffer.toString('utf8')));
+            }
+            catch (error) {
+                n8n_workflow_1.ErrorReporterProxy.error(new n8n_workflow_1.ApplicationError('Error parsing push message', {
+                    extra: {
+                        userId,
+                        data,
+                    },
+                    cause: error,
+                }));
+                this.logger.error("Couldn't parse message from editor-UI", {
+                    error: error,
+                    pushRef,
+                    data,
+                });
+            }
+        };
         connection.once('close', () => {
             connection.off('pong', heartbeat);
+            connection.off('message', onMessage);
             this.remove(pushRef);
         });
+        connection.on('message', onMessage);
     }
     close(connection) {
         connection.close();
@@ -51,6 +74,6 @@ let WebSocketPush = class WebSocketPush extends abstract_push_1.AbstractPush {
 exports.WebSocketPush = WebSocketPush;
 exports.WebSocketPush = WebSocketPush = __decorate([
     (0, typedi_1.Service)(),
-    __metadata("design:paramtypes", [Logger_1.Logger])
+    __metadata("design:paramtypes", [logger_1.Logger])
 ], WebSocketPush);
 //# sourceMappingURL=websocket.push.js.map

package/dist/push/websocket.push.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket.push.js","sourceRoot":"","sources":["../../src/push/websocket.push.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAAiC;AACjC,qCAAkC;AAClC,mDAA+C;AAE/C,SAAS,SAAS;IACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;AACrB,CAAC;AAGM,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,4BAAuB;IACzD,YAAY,MAAc;QACzB,KAAK,CAAC,MAAM,CAAC,CAAC;QAGd,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,UAAqB;QACzC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;QAC1B,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEjC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAG/B,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YAC7B,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACJ,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;IAEO,OAAO;QACd,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAE7C,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACzB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBACjC,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC;YAC/B,CAAC;YAED,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;YAC3B,UAAU,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC;IACF,CAAC;CACD,CAAA;AA1CY,sCAAa;wBAAb,aAAa;IADzB,IAAA,gBAAO,GAAE;qCAEW,eAAM;GADd,aAAa,CA0CzB"}
+{"version":3,"file":"websocket.push.js","sourceRoot":"","sources":["../../src/push/websocket.push.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,mCAAiC;AACjC,qCAAkC;AAClC,mDAA+C;AAE/C,+CAAoE;AAEpE,SAAS,SAAS;IACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;AACrB,CAAC;AAGM,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,4BAAuB;IACzD,YAAY,MAAc;QACzB,KAAK,CAAC,MAAM,CAAC,CAAC;QAGd,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,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;IAEO,OAAO;QACd,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAE7C,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACzB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBACjC,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC;YAC/B,CAAC;YAED,UAAU,CAAC,OAAO,GAAG,KAAK,CAAC;YAC3B,UAAU,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC;IACF,CAAC;CACD,CAAA;AApEY,sCAAa;wBAAb,aAAa;IADzB,IAAA,gBAAO,GAAE;qCAEW,eAAM;GADd,aAAa,CAoEzB"}

package/dist/requests.d.ts

@@ -1,14 +1,14 @@
 import type express from 'express';
 import type { BannerName, ICredentialDataDecryptedObject, IDataObject, ILoadOptions, INodeCredentialTestRequest, INodeCredentials, INodeParameters, INodeTypeNameVersion, IPersonalizationSurveyAnswersV4, IUser } from 'n8n-workflow';
-import type { PublicUser, SecretsProvider, SecretsProviderState } from './Interfaces';
-import { AssignableRole } from './databases/entities/User';
-import type { GlobalRole, User } from './databases/entities/User';
-import type { Variables } from './databases/entities/Variables';
-import type { WorkflowEntity } from './databases/entities/WorkflowEntity';
-import type { CredentialsEntity } from './databases/entities/CredentialsEntity';
-import type { WorkflowHistory } from './databases/entities/WorkflowHistory';
-import type { Project, ProjectType } from './databases/entities/Project';
-import type { ProjectRole } from './databases/entities/ProjectRelation';
+import type { PublicUser, SecretsProvider, SecretsProviderState } from './interfaces';
+import { AssignableRole } from './databases/entities/user';
+import type { GlobalRole, User } from './databases/entities/user';
+import type { Variables } from './databases/entities/variables';
+import type { WorkflowEntity } from './databases/entities/workflow-entity';
+import type { CredentialsEntity } from './databases/entities/credentials-entity';
+import type { WorkflowHistory } from './databases/entities/workflow-history';
+import type { Project, ProjectType } from './databases/entities/project';
+import type { ProjectRole } from './databases/entities/project-relation';
 import type { Scope } from '@n8n/permissions';
 import type { ScopesField } from './services/role.service';
 import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
@@ -320,6 +320,22 @@ export declare namespace TagsRequest {
         id: string;
     }>;
 }
+export declare namespace AnnotationTagsRequest {
+    type GetAll = AuthenticatedRequest<{}, {}, {}, {
+        withUsageCount: string;
+    }>;
+    type Create = AuthenticatedRequest<{}, {}, {
+        name: string;
+    }>;
+    type Update = AuthenticatedRequest<{
+        id: string;
+    }, {}, {
+        name: string;
+    }>;
+    type Delete = AuthenticatedRequest<{
+        id: string;
+    }>;
+}
 export declare namespace NodeRequest {
     type GetAll = AuthenticatedRequest;
     type Post = AuthenticatedRequest<{}, {}, {

package/dist/response-helper.js

@@ -0,0 +1,120 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUniqueConstraintError = void 0;
+exports.sendSuccessResponse = sendSuccessResponse;
+exports.sendErrorResponse = sendErrorResponse;
+exports.reportError = reportError;
+exports.send = send;
+const picocolors_1 = __importDefault(require("picocolors"));
+const n8n_workflow_1 = require("n8n-workflow");
+const node_stream_1 = require("node:stream");
+const constants_1 = require("./constants");
+const response_error_1 = require("./errors/response-errors/abstract/response.error");
+const typedi_1 = __importDefault(require("typedi"));
+const logger_1 = require("./logger");
+function sendSuccessResponse(res, data, raw, responseCode, responseHeader) {
+    if (responseCode !== undefined) {
+        res.status(responseCode);
+    }
+    if (responseHeader) {
+        res.header(responseHeader);
+    }
+    if (data instanceof node_stream_1.Readable) {
+        data.pipe(res);
+        return;
+    }
+    if (raw === true) {
+        if (typeof data === 'string') {
+            res.send(data);
+        }
+        else {
+            res.json(data);
+        }
+    }
+    else {
+        res.json({
+            data,
+        });
+    }
+}
+function isResponseError(error) {
+    if (error instanceof response_error_1.ResponseError) {
+        return true;
+    }
+    if (error instanceof Error) {
+        return ('httpStatusCode' in error &&
+            typeof error.httpStatusCode === 'number' &&
+            'errorCode' in error &&
+            typeof error.errorCode === 'number');
+    }
+    return false;
+}
+function sendErrorResponse(res, error) {
+    let httpStatusCode = 500;
+    const response = {
+        code: 0,
+        message: error.message ?? 'Unknown error',
+    };
+    if (isResponseError(error)) {
+        if (constants_1.inDevelopment) {
+            typedi_1.default.get(logger_1.Logger).error(picocolors_1.default.red([error.httpStatusCode, error.message].join(' ')));
+        }
+        const { originalUrl } = res.req;
+        if (error.errorCode === 404 && originalUrl) {
+            const basePath = originalUrl.split('/')[1];
+            const isLegacyFormTrigger = originalUrl.includes(n8n_workflow_1.FORM_TRIGGER_PATH_IDENTIFIER);
+            const isFormTrigger = basePath.includes('form');
+            if (isFormTrigger || isLegacyFormTrigger) {
+                const isTestWebhook = basePath.includes('test');
+                res.status(404);
+                return res.render('form-trigger-404', { isTestWebhook });
+            }
+        }
+        httpStatusCode = error.httpStatusCode;
+        if (error.errorCode) {
+            response.code = error.errorCode;
+        }
+        if (error.hint) {
+            response.hint = error.hint;
+        }
+    }
+    if (error instanceof n8n_workflow_1.NodeApiError) {
+        if (constants_1.inDevelopment) {
+            typedi_1.default.get(logger_1.Logger).error([picocolors_1.default.red(error.name), error.message].join(' '));
+        }
+        Object.assign(response, error);
+    }
+    if (error.stack && constants_1.inDevelopment) {
+        response.stacktrace = error.stack;
+    }
+    res.status(httpStatusCode).json(response);
+}
+const isUniqueConstraintError = (error) => ['unique', 'duplicate'].some((s) => error.message.toLowerCase().includes(s));
+exports.isUniqueConstraintError = isUniqueConstraintError;
+function reportError(error) {
+    if (!(error instanceof response_error_1.ResponseError) || error.httpStatusCode > 404) {
+        n8n_workflow_1.ErrorReporterProxy.error(error);
+    }
+}
+function send(processFunction, raw = false) {
+    return async (req, res) => {
+        try {
+            const data = await processFunction(req, res);
+            if (!res.headersSent)
+                sendSuccessResponse(res, data, raw);
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                reportError(error);
+                if ((0, exports.isUniqueConstraintError)(error)) {
+                    error.message = 'There is already an entry with this name';
+                }
+            }
+            sendErrorResponse(res, error);
+        }
+    };
+}
+//# sourceMappingURL=response-helper.js.map