n8n 2.15.1 → 2.17.0

package/dist/public-api/v1/public-api-error-response.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendPublicApiErrorResponse = sendPublicApiErrorResponse;
+const http_error_classifier_1 = require("../../errors/http-error-classifier");
+const http_error_serializers_1 = require("../../errors/http-error-serializers");
+function sendPublicApiErrorResponse(res, error) {
+    const descriptor = (0, http_error_classifier_1.classifyHttpError)(error);
+    const { status, body } = (0, http_error_serializers_1.serializePublicApiError)(descriptor);
+    res.status(status).json(body);
+}
+//# sourceMappingURL=public-api-error-response.js.map

package/dist/public-api/v1/public-api-error-response.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public-api-error-response.js","sourceRoot":"","sources":["../../../src/public-api/v1/public-api-error-response.ts"],"names":[],"mappings":";;AASA,gEAIC;AAXD,0EAAmE;AACnE,4EAA0E;AAM1E,SAAgB,0BAA0B,CAAC,GAAa,EAAE,KAAY;IACrE,MAAM,UAAU,GAAG,IAAA,yCAAiB,EAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,gDAAuB,EAAC,UAAU,CAAC,CAAC;IAC7D,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC"}

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

@@ -16,7 +16,7 @@ export declare const validCursor: (req: PaginatedRequest, res: express.Response,
 export type ScopeTaggedMiddleware = ((...args: unknown[]) => unknown) & {
     __apiKeyScope: ApiKeyScope;
 };
-export declare const apiKeyHasScope: (apiKeyScope: ApiKeyScope) => ScopeTaggedMiddleware;
+export declare const publicApiScope: (apiKeyScope: ApiKeyScope) => ScopeTaggedMiddleware;
 export declare const apiKeyHasScopeWithGlobalScopeFallback: (config: {
     scope: ApiKeyScope & Scope;
 } | {

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

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLicensed = exports.validLicenseWithUserQuota = exports.apiKeyHasScopeWithGlobalScopeFallback = exports.apiKeyHasScope = exports.validCursor = exports.projectScope = exports.globalScope = void 0;
+exports.isLicensed = exports.validLicenseWithUserQuota = exports.apiKeyHasScopeWithGlobalScopeFallback = exports.publicApiScope = exports.validCursor = exports.projectScope = exports.globalScope = void 0;
 const di_1 = require("@n8n/di");
 const feature_not_licensed_error_1 = require("../../../../errors/feature-not-licensed.error");
 const not_found_error_1 = require("../../../../errors/response-errors/not-found.error");
 const license_1 = require("../../../../license");
 const check_access_1 = require("../../../../permissions.ee/check-access");
-const public_api_key_service_1 = require("../../../../services/public-api-key.service");
 const pagination_service_1 = require("../services/pagination.service");
 const UNLIMITED_USERS_QUOTA = -1;
 const buildScopeMiddleware = (scopes, resource, { globalOnly } = { globalOnly: false }) => {
@@ -68,14 +67,26 @@ function tagMiddleware(middleware, apiKeyScope) {
     const tagged = Object.assign((req, res, next) => middleware(req, res, next), { __apiKeyScope: apiKeyScope });
     return tagged;
 }
-const apiKeyHasScope = (apiKeyScope) => {
-    const middleware = di_1.Container.get(public_api_key_service_1.PublicApiKeyService).getApiKeyScopeMiddleware(apiKeyScope);
-    return tagMiddleware(middleware, apiKeyScope);
-};
-exports.apiKeyHasScope = apiKeyHasScope;
+function makePublicApiScopeEnforcementMiddleware(endpointScope) {
+    return async (req, res, next) => {
+        const { tokenGrant } = req;
+        if (!tokenGrant) {
+            res.status(403).json({ message: 'Forbidden' });
+            return;
+        }
+        if (!tokenGrant.apiKeyScopes?.includes(endpointScope)) {
+            res.status(403).json({ message: 'Forbidden' });
+            return;
+        }
+        next();
+        return;
+    };
+}
+const publicApiScope = (apiKeyScope) => tagMiddleware(makePublicApiScopeEnforcementMiddleware(apiKeyScope), apiKeyScope);
+exports.publicApiScope = publicApiScope;
 const apiKeyHasScopeWithGlobalScopeFallback = (config) => {
     const scope = 'scope' in config ? config.scope : config.apiKeyScope;
-    return tagMiddleware(di_1.Container.get(public_api_key_service_1.PublicApiKeyService).getApiKeyScopeMiddleware(scope), scope);
+    return tagMiddleware(makePublicApiScopeEnforcementMiddleware(scope), scope);
 };
 exports.apiKeyHasScopeWithGlobalScopeFallback = apiKeyHasScopeWithGlobalScopeFallback;
 const validLicenseWithUserQuota = (_, res, next) => {

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

@@ -1 +1 @@
-{"version":3,"file":"global.middleware.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/shared/middlewares/global.middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"global.middleware.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/shared/middlewares/global.middleware.ts"],"names":[],"mappings":";;;AAGA,gCAAoC;AAIpC,oFAA8E;AAC9E,8EAAyE;AACzE,uCAAoC;AACpC,gEAA8D;AAG9D,uEAA8D;AAE9D,MAAM,qBAAqB,GAAG,CAAC,CAAC,CAAC;AAIjC,MAAM,oBAAoB,GAAG,CAC5B,MAAe,EACf,QAA+B,EAC/B,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,EACrC,EAAE;IACH,OAAO,KAAK,EACX,GAAgE,EAChE,GAAqB,EACrB,IAA0B,EACS,EAAE;QACrC,MAAM,MAAM,GAAyE,EAAE,CAAC;QACxF,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACnB,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC7B,MAAM,CAAC,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,CAAC;iBAAM,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;gBACtC,MAAM,CAAC,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,CAAC;QACF,CAAC;aAAM,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC/D,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC;QAC7C,CAAC;QAED,IAAI,CAAC;YACJ,IAAI,CAAC,CAAC,MAAM,IAAA,4BAAa,EAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;gBAClE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YACvD,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,+BAAa,EAAE,CAAC;gBACpC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACzD,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;QAED,OAAO,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,WAAW,GAAG,CAAC,MAAuB,EAAE,EAAE,CACtD,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AADrF,QAAA,WAAW,eAC0E;AAE3F,MAAM,YAAY,GAAG,CAAC,MAAuB,EAAE,QAA8B,EAAE,EAAE,CACvF,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AADrF,QAAA,YAAY,gBACyE;AAE3F,MAAM,WAAW,GAAG,CAC1B,GAAqB,EACrB,GAAqB,EACrB,IAA0B,EACA,EAAE;IAC5B,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAC7B,IAAI,CAAC;YACJ,MAAM,cAAc,GAAG,IAAA,iCAAY,EAAC,MAAM,CAAC,CAAC;YAC5C,IAAI,QAAQ,IAAI,cAAc,EAAE,CAAC;gBAChC,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;gBACzC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACP,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;gBACzC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;YACxC,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC3B,OAAO,EAAE,gCAAgC;aACzC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,OAAO,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAxBW,QAAA,WAAW,eAwBtB;AAMF,SAAS,aAAa,CACrB,UAA2C,EAC3C,WAAwB;IAExB,MAAM,MAAM,GAA0B,MAAM,CAAC,MAAM,CAClD,CAAC,GAAY,EAAE,GAAY,EAAE,IAAa,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EACzE,EAAE,aAAa,EAAE,WAAW,EAAE,CAC9B,CAAC;IACF,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,uCAAuC,CAAC,aAA0B;IAC1E,OAAO,KAAK,EACX,GAAyB,EACzB,GAAqB,EACrB,IAA0B,EACV,EAAE;QAClB,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;QAE3B,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YAC/C,OAAO;QACR,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACvD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YAC/C,OAAO;QACR,CAAC;QAED,IAAI,EAAE,CAAC;QACP,OAAO;IACR,CAAC,CAAC;AACH,CAAC;AAEM,MAAM,cAAc,GAAG,CAAC,WAAwB,EAAE,EAAE,CAC1D,aAAa,CAAC,uCAAuC,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC;AADrE,QAAA,cAAc,kBACuD;AAE3E,MAAM,qCAAqC,GAAG,CACpD,MAAyF,EACxF,EAAE;IACH,MAAM,KAAK,GAAG,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;IACpE,OAAO,aAAa,CAAC,uCAAuC,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;AAC7E,CAAC,CAAC;AALW,QAAA,qCAAqC,yCAKhD;AAEK,MAAM,yBAAyB,GAAG,CACxC,CAAkB,EAClB,GAAqB,EACrB,IAA0B,EACA,EAAE;IAC5B,MAAM,OAAO,GAAG,cAAS,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAC;IACvC,IAAI,OAAO,CAAC,aAAa,EAAE,KAAK,qBAAqB,EAAE,CAAC;QACvD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC3B,OAAO,EAAE,gFAAgF;SACzF,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAbW,QAAA,yBAAyB,6BAapC;AAEK,MAAM,UAAU,GAAG,CAAC,OAA8B,EAAE,EAAE;IAC5D,OAAO,KAAK,EAAE,CAAuB,EAAE,GAAqB,EAAE,IAA0B,EAAE,EAAE;QAC3F,IAAI,cAAS,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;YAAE,OAAO,IAAI,EAAE,CAAC;QAE9D,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,oDAAuB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACxF,CAAC,CAAC;AACH,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB"}

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

@@ -18,6 +18,7 @@ export declare abstract class AbstractPush<Connection> extends TypedEmitter<Abst
     constructor(logger: Logger, errorReporter: ErrorReporter);
     protected add(pushRef: string, userId: User['id'], connection: Connection): void;
     protected onMessageReceived(pushRef: string, msg: unknown): void;
+    protected getConnection(pushRef: string): Connection | undefined;
     protected remove(pushRef?: string): void;
     private sendTo;
     private pingAll;

package/dist/push/abstract.push.js

@@ -39,6 +39,9 @@ let AbstractPush = class AbstractPush extends typed_emitter_1.TypedEmitter {
         const userId = this.userIdByPushRef[pushRef];
         this.emit('message', { pushRef, userId, msg });
     }
+    getConnection(pushRef) {
+        return this.connections[pushRef];
+    }
     remove(pushRef) {
         if (!pushRef)
             return;

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

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

package/dist/push/sse.push.js

@@ -22,7 +22,11 @@ let SSEPush = class SSEPush extends abstract_push_1.AbstractPush {
         res.write(':ok\n\n');
         res.flush();
         super.add(pushRef, userId, connection);
-        const removeClient = () => this.remove(pushRef);
+        const removeClient = () => {
+            if (this.getConnection(pushRef) === connection) {
+                this.remove(pushRef);
+            }
+        };
         req.once('end', removeClient);
         req.once('close', removeClient);
         res.once('finish', removeClient);

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

@@ -1 +1 @@
-{"version":3,"file":"sse.push.js","sourceRoot":"","sources":["../../src/push/sse.push.ts"],"names":[],"mappings":";;;;;;;;;AACA,gCAAkC;AAElC,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,YAAO,GAAE;GACG,OAAO,CAsCnB"}
+{"version":3,"file":"sse.push.js","sourceRoot":"","sources":["../../src/push/sse.push.ts"],"names":[],"mappings":";;;;;;;;;AACA,gCAAkC;AAElC,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;QAKvC,MAAM,YAAY,GAAG,GAAG,EAAE;YACzB,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;gBAChD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtB,CAAC;QACF,CAAC,CAAC;QACF,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;AA5CY,0BAAO;kBAAP,OAAO;IADnB,IAAA,YAAO,GAAE;GACG,OAAO,CA4CnB"}

package/dist/push/websocket.push.js

@@ -50,7 +50,9 @@ let WebSocketPush = class WebSocketPush extends abstract_push_1.AbstractPush {
         connection.once('close', () => {
             connection.off('pong', heartbeat);
             connection.off('message', onMessage);
-            this.remove(pushRef);
+            if (this.getConnection(pushRef) === connection) {
+                this.remove(pushRef);
+            }
         });
         connection.on('message', onMessage);
     }

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

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

package/dist/response-helper.js

@@ -14,6 +14,8 @@ const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const node_stream_1 = require("node:stream");
 const picocolors_1 = __importDefault(require("picocolors"));
+const http_error_classifier_1 = require("./errors/http-error-classifier");
+const http_error_serializers_1 = require("./errors/http-error-serializers");
 const response_error_1 = require("./errors/response-errors/abstract/response.error");
 function sendSuccessResponse(res, data, raw, responseCode, responseHeader) {
     if (responseCode !== undefined) {
@@ -40,25 +42,8 @@ function sendSuccessResponse(res, data, raw, responseCode, responseHeader) {
         });
     }
 }
-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 ((0, http_error_classifier_1.isResponseError)(error)) {
         if (backend_common_1.inDevelopment) {
             di_1.Container.get(backend_common_1.Logger).error(picocolors_1.default.red([error.httpStatusCode, error.message].join(' ')));
         }
@@ -78,17 +63,9 @@ function sendErrorResponse(res, error) {
                 message: error.message,
             });
         }
-        httpStatusCode = error.httpStatusCode;
-        if (error.errorCode) {
-            response.code = error.errorCode;
-        }
-        if (error.hint) {
-            response.hint = error.hint;
-        }
-        if (error.meta) {
-            response.meta = error.meta;
-        }
     }
+    const descriptor = (0, http_error_classifier_1.classifyHttpError)(error);
+    const { status, body: response } = (0, http_error_serializers_1.serializeInternalRestError)(descriptor);
     if (error instanceof n8n_workflow_1.NodeApiError) {
         if (backend_common_1.inDevelopment) {
             di_1.Container.get(backend_common_1.Logger).error([picocolors_1.default.red(error.name), error.message].join(' '));
@@ -98,7 +75,7 @@ function sendErrorResponse(res, error) {
     if (error.stack && backend_common_1.inDevelopment) {
         response.stacktrace = error.stack;
     }
-    res.status(httpStatusCode).json(response);
+    res.status(status).json(response);
 }
 const isUniqueConstraintError = (error) => ['unique', 'duplicate'].some((s) => error.message.toLowerCase().includes(s));
 exports.isUniqueConstraintError = isUniqueConstraintError;

package/dist/response-helper.js.map

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

package/dist/scaling/pubsub/subscriber.service.d.ts

@@ -21,6 +21,7 @@ export declare class Subscriber {
     private readonly workerResponseChannel;
     private readonly mcpRelayChannel;
     private mcpRelayHandler?;
+    private readonly debouncedHandlers;
     constructor(logger: Logger, instanceSettings: InstanceSettings, pubsubEventBus: PubSubEventBus, redisClientService: RedisClientService, executionsConfig: ExecutionsConfig, globalConfig: GlobalConfig);
     setMcpRelayHandler(handler: (msg: McpRelayMessage) => void): void;
     private handleMcpRelayMessage;
@@ -30,5 +31,6 @@ export declare class Subscriber {
     getMcpRelayChannel(): string;
     shutdown(): void;
     subscribe(channel: string): Promise<void>;
+    private eventNameFrom;
     private parseMessage;
 }

package/dist/scaling/pubsub/subscriber.service.js

@@ -30,6 +30,7 @@ let Subscriber = class Subscriber {
         this.redisClientService = redisClientService;
         this.executionsConfig = executionsConfig;
         this.globalConfig = globalConfig;
+        this.debouncedHandlers = new Map();
         if (this.executionsConfig.mode !== 'queue')
             return;
         this.logger = this.logger.scoped(['scaling', 'pubsub']);
@@ -39,10 +40,8 @@ let Subscriber = class Subscriber {
         this.mcpRelayChannel = `${prefix}:${constants_1.MCP_RELAY_PUBSUB_CHANNEL}`;
         this.client = this.redisClientService.createClient({ type: 'subscriber(n8n)' });
         const handlerFn = (msg) => {
-            const eventName = 'command' in msg ? msg.command : msg.response;
-            this.pubsubEventBus.emit(eventName, msg.payload);
+            this.pubsubEventBus.emit(this.eventNameFrom(msg), msg.payload);
         };
-        const debouncedHandlerFn = (0, debounce_1.default)(handlerFn, 300);
         this.client.on('message', (channel, str) => {
             if (channel === this.mcpRelayChannel) {
                 this.handleMcpRelayMessage(str);
@@ -51,10 +50,15 @@ let Subscriber = class Subscriber {
             const msg = this.parseMessage(str, channel);
             if (!msg)
                 return;
-            if (msg.debounce)
-                debouncedHandlerFn(msg);
-            else
-                handlerFn(msg);
+            if (!msg.debounce)
+                return handlerFn(msg);
+            const eventName = this.eventNameFrom(msg);
+            let handler = this.debouncedHandlers.get(eventName);
+            if (!handler) {
+                handler = (0, debounce_1.default)(handlerFn, 300);
+                this.debouncedHandlers.set(eventName, handler);
+            }
+            handler(msg);
         });
     }
     setMcpRelayHandler(handler) {
@@ -87,6 +91,8 @@ let Subscriber = class Subscriber {
         return this.mcpRelayChannel;
     }
     shutdown() {
+        for (const handler of this.debouncedHandlers.values())
+            handler.cancel();
         this.client.disconnect();
     }
     async subscribe(channel) {
@@ -98,6 +104,9 @@ let Subscriber = class Subscriber {
             this.logger.debug(`Subscribed to channel ${channel}`);
         });
     }
+    eventNameFrom(msg) {
+        return 'command' in msg ? msg.command : msg.response;
+    }
     parseMessage(str, channel) {
         const msg = (0, n8n_workflow_1.jsonParse)(str, {
             fallbackValue: null,
@@ -115,7 +124,7 @@ let Subscriber = class Subscriber {
             (msg.senderId === hostId || (msg.targets && !msg.targets.includes(hostId)))) {
             return null;
         }
-        let msgName = 'command' in msg ? msg.command : msg.response;
+        let msgName = this.eventNameFrom(msg);
         const metadata = { msg: msgName, channel };
         if ('command' in msg && msg.command === 'relay-execution-lifecycle-event') {
             const { data, type } = msg.payload;

package/dist/scaling/pubsub/subscriber.service.js.map

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

package/dist/scaling/redis/redis.types.d.ts

@@ -1,4 +1,4 @@
 export type RedisClientType = N8nRedisClientType | BullRedisClientType;
-type N8nRedisClientType = 'subscriber(n8n)' | 'publisher(n8n)' | 'cache(n8n)';
+type N8nRedisClientType = 'subscriber(n8n)' | 'publisher(n8n)' | 'cache(n8n)' | 'registry(n8n)';
 type BullRedisClientType = 'subscriber(bull)' | 'client(bull)' | 'bclient(bull)';
 export {};

package/dist/security-audit/risk-reporters/credentials-risk-reporter.d.ts

@@ -1,13 +1,12 @@
 import { SecurityConfig } from '@n8n/config';
-import { CredentialsRepository, ExecutionDataRepository, ExecutionRepository } from '@n8n/db';
+import { CredentialsRepository, ExecutionDataRepository } from '@n8n/db';
 import type { IWorkflowBase } from 'n8n-workflow';
 import type { RiskReporter, Risk } from '../../security-audit/types';
 export declare class CredentialsRiskReporter implements RiskReporter {
     private readonly credentialsRepository;
-    private readonly executionRepository;
     private readonly executionDataRepository;
     private readonly securityConfig;
-    constructor(credentialsRepository: CredentialsRepository, executionRepository: ExecutionRepository, executionDataRepository: ExecutionDataRepository, securityConfig: SecurityConfig);
+    constructor(credentialsRepository: CredentialsRepository, executionDataRepository: ExecutionDataRepository, securityConfig: SecurityConfig);
     report(workflows: IWorkflowBase[]): Promise<Risk.StandardReport | null>;
     private getAllCredsInUse;
     private getAllExistingCreds;

package/dist/security-audit/risk-reporters/credentials-risk-reporter.js

@@ -15,9 +15,8 @@ const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const constants_1 = require("../../security-audit/constants");
 let CredentialsRiskReporter = class CredentialsRiskReporter {
-    constructor(credentialsRepository, executionRepository, executionDataRepository, securityConfig) {
+    constructor(credentialsRepository, executionDataRepository, securityConfig) {
         this.credentialsRepository = credentialsRepository;
-        this.executionRepository = executionRepository;
         this.executionDataRepository = executionDataRepository;
         this.securityConfig = securityConfig;
     }
@@ -102,8 +101,7 @@ let CredentialsRiskReporter = class CredentialsRiskReporter {
     async getExecutedWorkflowsInPastDays(days) {
         const date = new Date();
         date.setDate(date.getDate() - days);
-        const executionIds = await this.executionRepository.getIdsSince(date);
-        return await this.executionDataRepository.findByExecutionIds(executionIds);
+        return await this.executionDataRepository.getWorkflowsExecutedSince(date);
     }
     async getCredsInRecentlyExecutedWorkflows(days) {
         const executedWorkflows = await this.getExecutedWorkflowsInPastDays(days);
@@ -124,7 +122,6 @@ exports.CredentialsRiskReporter = CredentialsRiskReporter;
 exports.CredentialsRiskReporter = CredentialsRiskReporter = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [db_1.CredentialsRepository,
-        db_1.ExecutionRepository,
         db_1.ExecutionDataRepository,
         config_1.SecurityConfig])
 ], CredentialsRiskReporter);

package/dist/security-audit/risk-reporters/credentials-risk-reporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials-risk-reporter.js","sourceRoot":"","sources":["../../../src/security-audit/risk-reporters/credentials-risk-reporter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"credentials-risk-reporter.js","sourceRoot":"","sources":["../../../src/security-audit/risk-reporters/credentials-risk-reporter.ts"],"names":[],"mappings":"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"}

package/dist/services/ai-gateway.service.d.ts

@@ -0,0 +1,44 @@
+import { LicenseState } from '@n8n/backend-common';
+import { GlobalConfig } from '@n8n/config';
+import { UserRepository } from '@n8n/db';
+import { InstanceSettings } from 'n8n-core';
+import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
+import type { AiGatewayConfigDto, AiGatewayUsageResponse } from '@n8n/api-types';
+import { License } from '../license';
+import { OwnershipService } from '../services/ownership.service';
+interface GatewayCreditsResponse {
+    creditsQuota: number;
+    creditsRemaining: number;
+}
+export declare class AiGatewayService {
+    private readonly globalConfig;
+    private readonly license;
+    private readonly licenseState;
+    private readonly instanceSettings;
+    private readonly ownershipService;
+    private readonly userRepository;
+    private readonly tokenCache;
+    private readonly TOKEN_CACHE_MAX_SIZE;
+    private readonly pendingTokenRequests;
+    private gatewayConfig;
+    private configFetchedAt;
+    private static readonly CONFIG_TTL_MS;
+    constructor(globalConfig: GlobalConfig, license: License, licenseState: LicenseState, instanceSettings: InstanceSettings, ownershipService: OwnershipService, userRepository: UserRepository);
+    private resolveUserId;
+    getSyntheticCredential({ credentialType, userId, workflowId, projectId, }: {
+        credentialType: string;
+        userId: string | undefined;
+        workflowId?: string;
+        projectId?: string;
+    }): Promise<ICredentialDataDecryptedObject>;
+    getUsage(userId: string, offset: number, limit: number): Promise<AiGatewayUsageResponse>;
+    getCreditsRemaining(userId: string): Promise<GatewayCreditsResponse>;
+    private parseCreditsResponse;
+    private requireBaseUrl;
+    private isConfigStale;
+    getGatewayConfig(): Promise<AiGatewayConfigDto>;
+    private buildGatewayCredentialsHeaders;
+    private getOrFetchToken;
+    private fetchAndCacheToken;
+}
+export {};