npm - n8n - Versions diffs - 2.2.4 → 2.3.1 - Mend

n8n 2.2.4 → 2.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (87) hide show

package/dist/modules/insights/insights-compaction.service.js CHANGED Viewed

@@ -15,6 +15,7 @@ const di_1 = require("@n8n/di");
 const insights_by_period_repository_1 = require("./database/repositories/insights-by-period.repository");
 const insights_raw_repository_1 = require("./database/repositories/insights-raw.repository");
 const insights_config_1 = require("./insights.config");
+const constants_1 = require("@n8n/constants");
 let InsightsCompactionService = class InsightsCompactionService {
     constructor(insightsByPeriodRepository, insightsRawRepository, insightsConfig, logger) {
         this.insightsByPeriodRepository = insightsByPeriodRepository;
@@ -25,7 +26,7 @@ let InsightsCompactionService = class InsightsCompactionService {
     }
     startCompactionTimer() {
         this.stopCompactionTimer();
-        this.compactInsightsTimer = setInterval(async () => await this.compactInsights(), this.insightsConfig.compactionIntervalMinutes * 60 * 1000);
+        this.compactInsightsTimer = setInterval(async () => await this.compactInsights(), this.insightsConfig.compactionIntervalMinutes * constants_1.Time.minutes.toMilliseconds);
         this.logger.debug('Started compaction timer');
     }
     stopCompactionTimer() {

package/dist/modules/insights/insights-compaction.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"insights-compaction.service.js","sourceRoot":"","sources":["../../../src/modules/insights/insights-compaction.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAElC,yGAAmG;AACnG,6FAAwF;AACxF,uDAAmD;~~AAO5C~~,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAGrC,YACkB,0BAAsD,EACtD,qBAA4C,EAC5C,cAA8B,EAC9B,MAAc;QAHd,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,WAAM,GAAN,MAAM,CAAQ;QAE/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IAED,oBAAoB;QACnB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,oBAAoB,GAAG,WAAW,CACtC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,eAAe,EAAE,EACxC,IAAI,CAAC,cAAc,CAAC,yBAAyB,GAAG,~~EAAE~~,~~GAAG~~,~~IAAI~~,~~CACzD~~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"}
1	+ {"version":3,"file":"insights-compaction.service.js","sourceRoot":"","sources":["../../../src/modules/insights/insights-compaction.service.ts"],"names":[],"mappings":"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"}

package/dist/public-api/types.d.ts CHANGED Viewed

@@ -143,6 +143,16 @@ export declare namespace CredentialRequest {
         name: string;
         data: ICredentialDataDecryptedObject;
     }, {}>;
+    type Update = AuthenticatedRequest<{
+        id: string;
+    }, {}, {
+        type?: string;
+        name?: string;
+        data?: ICredentialDataDecryptedObject;
+        isGlobal?: boolean;
+        isResolvable?: boolean;
+        isPartialData?: boolean;
+    }, {}>;
     type Delete = AuthenticatedRequest<{
         id: string;
     }, {}, {}, Record<string, string>>;

package/dist/public-api/v1/handlers/credentials/credentials.handler.d.ts CHANGED Viewed

@@ -3,6 +3,9 @@ import type express from 'express';
 import type { CredentialTypeRequest, CredentialRequest } from '../../../types';
 declare const _default: {
     createCredential: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>) | ((req: CredentialRequest.Create, res: express.Response, next: express.NextFunction) => express.Response | void) | ((req: CredentialRequest.Create, res: express.Response) => Promise<express.Response<Partial<CredentialsEntity>>>))[];
+    updateCredential: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: import("@n8n/db").AuthenticatedRequest<{
+        id?: string;
+    }>, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>) | ((req: CredentialRequest.Update, res: express.Response, next: express.NextFunction) => express.Response | void))[];
     transferCredential: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: import("@n8n/db").AuthenticatedRequest<{
         id?: string;
     }>, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>))[];

package/dist/public-api/v1/handlers/credentials/credentials.handler.js CHANGED Viewed

@@ -1,5 +1,7 @@
 "use strict";
+const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
+const permissions_1 = require("@n8n/permissions");
 const zod_1 = require("zod");
 const credential_types_1 = require("../../../../credential-types");
 const credentials_service_ee_1 = require("../../../../credentials/credentials.service.ee");
@@ -25,6 +27,40 @@ module.exports = {
             }
         },
     ],
+    updateCredential: [
+        credentials_middleware_1.validCredentialTypeForUpdate,
+        credentials_middleware_1.validCredentialsPropertiesForUpdate,
+        (0, global_middleware_1.apiKeyHasScope)('credential:update'),
+        (0, global_middleware_1.projectScope)('credential:update', 'credential'),
+        async (req, res) => {
+            const { id: credentialId } = req.params;
+            if (req.body.isGlobal !== undefined) {
+                if (!di_1.Container.get(backend_common_1.LicenseState).isSharingLicensed()) {
+                    return res.status(403).json({ message: 'You are not licensed for sharing credentials' });
+                }
+                const canShareGlobally = (0, permissions_1.hasGlobalScope)(req.user, 'credential:shareGlobally');
+                if (!canShareGlobally) {
+                    return res.status(403).json({
+                        message: 'You do not have permission to change global sharing for credentials',
+                    });
+                }
+            }
+            try {
+                const updatedCredential = await (0, credentials_service_1.updateCredential)(credentialId, req.body);
+                if (!updatedCredential) {
+                    return res.status(404).json({ message: 'Credential not found' });
+                }
+                return res.json((0, credentials_service_1.sanitizeCredentials)(updatedCredential));
+            }
+            catch (error) {
+                if (error instanceof credentials_service_1.CredentialsIsNotUpdatableError) {
+                    return res.status(400).json({ message: error.message });
+                }
+                const message = error instanceof Error ? error.message : 'Unknown error';
+                return res.status(500).json({ message });
+            }
+        },
+    ],
     transferCredential: [
         (0, global_middleware_1.apiKeyHasScope)('credential:move'),
         (0, global_middleware_1.projectScope)('credential:move', 'credential'),

package/dist/public-api/v1/handlers/credentials/credentials.handler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"credentials.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.handler.ts"],"names":[],"mappings":";~~AAEA~~,gCAAoC;~~AAEpC~~,6BAAwB;AAExB,yDAAqD;AACrD,iFAAoF;AACpF,6DAAyD;AAEzD,~~qEAA2F~~;~~AAC3F~~,+~~DAS~~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"}
1	+ {"version":3,"file":"credentials.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.handler.ts"],"names":[],"mappings":"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"}

package/dist/public-api/v1/handlers/credentials/credentials.middleware.d.ts CHANGED Viewed

@@ -2,3 +2,5 @@ import type express from 'express';
 import type { CredentialRequest } from '../../../types';
 export declare const validCredentialType: (req: CredentialRequest.Create, res: express.Response, next: express.NextFunction) => express.Response | void;
 export declare const validCredentialsProperties: (req: CredentialRequest.Create, res: express.Response, next: express.NextFunction) => express.Response | void;
+export declare const validCredentialTypeForUpdate: (req: CredentialRequest.Update, res: express.Response, next: express.NextFunction) => express.Response | void;
+export declare const validCredentialsPropertiesForUpdate: (req: CredentialRequest.Update, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>;

package/dist/public-api/v1/handlers/credentials/credentials.middleware.js CHANGED Viewed

@@ -1,11 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validCredentialsProperties = exports.validCredentialType = void 0;
+exports.validCredentialsPropertiesForUpdate = exports.validCredentialTypeForUpdate = exports.validCredentialsProperties = exports.validCredentialType = void 0;
 const di_1 = require("@n8n/di");
 const jsonschema_1 = require("jsonschema");
 const credential_types_1 = require("../../../../credential-types");
 const credentials_helper_1 = require("../../../../credentials-helper");
 const credentials_service_1 = require("./credentials.service");
+function validateCredentialData(credentialType, data, res) {
+    const properties = di_1.Container.get(credentials_helper_1.CredentialsHelper)
+        .getCredentialsProperties(credentialType)
+        .filter((property) => property.type !== 'hidden');
+    const schema = (0, credentials_service_1.toJsonSchema)(properties);
+    const { valid, errors } = (0, jsonschema_1.validate)(data, schema, { nestedErrors: true });
+    if (!valid) {
+        return res.status(400).json({
+            message: errors.map((error) => `request.body.data ${error.message}`).join(','),
+        });
+    }
+}
 const validCredentialType = (req, res, next) => {
     try {
         di_1.Container.get(credential_types_1.CredentialTypes).getByName(req.body.type);
@@ -18,17 +30,55 @@ const validCredentialType = (req, res, next) => {
 exports.validCredentialType = validCredentialType;
 const validCredentialsProperties = (req, res, next) => {
     const { type, data } = req.body;
-    const properties = di_1.Container.get(credentials_helper_1.CredentialsHelper)
-        .getCredentialsProperties(type)
-        .filter((property) => property.type !== 'hidden');
-    const schema = (0, credentials_service_1.toJsonSchema)(properties);
-    const { valid, errors } = (0, jsonschema_1.validate)(data, schema, { nestedErrors: true });
-    if (!valid) {
-        return res.status(400).json({
-            message: errors.map((error) => `request.body.data ${error.message}`).join(','),
-        });
+    const validationResult = validateCredentialData(type, data, res);
+    if (validationResult) {
+        return validationResult;
     }
     return next();
 };
 exports.validCredentialsProperties = validCredentialsProperties;
+const validCredentialTypeForUpdate = (req, res, next) => {
+    const { type } = req.body;
+    if (type !== undefined) {
+        try {
+            di_1.Container.get(credential_types_1.CredentialTypes).getByName(type);
+        }
+        catch {
+            return res.status(400).json({ message: 'req.body.type is not a known type' });
+        }
+    }
+    return next();
+};
+exports.validCredentialTypeForUpdate = validCredentialTypeForUpdate;
+const validCredentialsPropertiesForUpdate = async (req, res, next) => {
+    let { type } = req.body;
+    const { data } = req.body;
+    const { id: credentialId } = req.params;
+    if (data !== undefined) {
+        if (type === undefined) {
+            const existingCredential = await (0, credentials_service_1.getCredentials)(credentialId);
+            if (!existingCredential) {
+                return res.status(404).json({ message: 'Credential not found' });
+            }
+            type = existingCredential.type;
+        }
+        const validationResult = validateCredentialData(type, data, res);
+        if (validationResult) {
+            return validationResult;
+        }
+    }
+    if (type !== undefined && data === undefined) {
+        const existingCredential = await (0, credentials_service_1.getCredentials)(credentialId);
+        if (!existingCredential) {
+            return res.status(404).json({ message: 'Credential not found' });
+        }
+        if (existingCredential.type !== type) {
+            return res.status(400).json({
+                message: 'req.body.data is required when changing credential type. The existing data cannot be used with the new type.',
+            });
+        }
+    }
+    return next();
+};
+exports.validCredentialsPropertiesForUpdate = validCredentialsPropertiesForUpdate;
 //# sourceMappingURL=credentials.middleware.js.map

package/dist/public-api/v1/handlers/credentials/credentials.middleware.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"credentials.middleware.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.middleware.ts"],"names":[],"mappings":";;;AAEA,gCAAoC;AAEpC,2CAAsC;~~AAEtC~~,yDAAqD;AACrD,6DAAyD;AAEzD,+~~DAAqD~~;~~AAG9C~~,MAAM,mBAAmB,GAAG,CAClC,GAA6B,EAC7B,GAAqB,EACrB,IAA0B,EACA,EAAE;IAC5B,IAAI,CAAC;QACJ,cAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,OAAO,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAZW,QAAA,mBAAmB,uBAY9B;AAEK,MAAM,0BAA0B,GAAG,CACzC,GAA6B,EAC7B,GAAqB,EACrB,IAA0B,EACA,EAAE;IAC5B,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;IAEhC,MAAM,~~UAAU~~,GAAG,~~cAAS~~,CAAC,GAAG,CAAC,~~sCAAiB~~,CAAC;~~SACjD~~,~~wBAAwB~~,CAAC,IAAI,CAAC;~~SAC9B~~,~~MAAM,~~CAAC,CAAC,~~QAAQ~~,EAAE,EAAE,CAAC,~~QAAQ~~,CAAC,IAAI,KAAK,~~QAAQ~~,CAAC,CAAC;~~IAEnD~~,MAAM,MAAM,GAAG,~~IAAA~~,~~kCAAY~~,~~EAAC~~,~~UAAU~~,CAAC,CAAC;~~IAExC~~,~~MAAM~~,EAAE,KAAK,EAAE,~~MAAM~~,EAAE,GAAG,~~IAAA~~,~~qBAAQ~~,~~EAAC~~,IAAI,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;~~IAEzE~~,IAAI,CAAC,~~KAAK~~,EAAE,CAAC;~~QACZ~~,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC~~;YAC3B~~,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,~~qBAAqB~~,~~KAAK~~,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;~~SAC9E~~,CAAC,CAAC;~~IACJ~~,CAAC;IAED,OAAO,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;~~AAtBW~~,QAAA,~~0BAA0B~~,~~8BAsBrC~~"}
1	+ {"version":3,"file":"credentials.middleware.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.middleware.ts"],"names":[],"mappings":"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"}

package/dist/public-api/v1/handlers/credentials/credentials.service.d.ts CHANGED Viewed

@@ -1,11 +1,21 @@
 import type { User, ICredentialsDb } from '@n8n/db';
 import { CredentialsEntity, SharedCredentials } from '@n8n/db';
-import type { IDataObject, INodeProperties } from 'n8n-workflow';
+import { BaseError, type ICredentialDataDecryptedObject, type IDataObject, type INodeProperties } from 'n8n-workflow';
 import type { CredentialRequest } from '../../../../requests';
+export declare class CredentialsIsNotUpdatableError extends BaseError {
+}
 export declare function getCredentials(credentialId: string): Promise<ICredentialsDb | null>;
 export declare function getSharedCredentials(userId: string, credentialId: string): Promise<SharedCredentials | null>;
 export declare function createCredential(properties: CredentialRequest.CredentialProperties): Promise<CredentialsEntity>;
 export declare function saveCredential(credential: CredentialsEntity, user: User, encryptedData: ICredentialsDb): Promise<CredentialsEntity>;
+export declare function updateCredential(credentialId: string, updateData: {
+    type?: string;
+    name?: string;
+    data?: ICredentialDataDecryptedObject;
+    isGlobal?: boolean;
+    isResolvable?: boolean;
+    isPartialData?: boolean;
+}): Promise<ICredentialsDb | null>;
 export declare function removeCredential(user: User, credentials: CredentialsEntity): Promise<ICredentialsDb>;
 export declare function encryptCredential(credential: CredentialsEntity): Promise<ICredentialsDb>;
 export declare function sanitizeCredentials(credentials: CredentialsEntity): Partial<CredentialsEntity>;

package/dist/public-api/v1/handlers/credentials/credentials.service.js CHANGED Viewed

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CredentialsIsNotUpdatableError = void 0;
 exports.getCredentials = getCredentials;
 exports.getSharedCredentials = getSharedCredentials;
 exports.createCredential = createCredential;
 exports.saveCredential = saveCredential;
+exports.updateCredential = updateCredential;
 exports.removeCredential = removeCredential;
 exports.encryptCredential = encryptCredential;
 exports.sanitizeCredentials = sanitizeCredentials;
@@ -11,8 +13,13 @@ exports.toJsonSchema = toJsonSchema;
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
+const n8n_workflow_1 = require("n8n-workflow");
+const credentials_service_1 = require("../../../../credentials/credentials.service");
 const event_service_1 = require("../../../../events/event.service");
 const external_hooks_1 = require("../../../../external-hooks");
+class CredentialsIsNotUpdatableError extends n8n_workflow_1.BaseError {
+}
+exports.CredentialsIsNotUpdatableError = CredentialsIsNotUpdatableError;
 async function getCredentials(credentialId) {
     return await di_1.Container.get(db_1.CredentialsRepository).findOneBy({ id: credentialId });
 }
@@ -58,6 +65,61 @@ async function saveCredential(credential, user, encryptedData) {
     });
     return result;
 }
+async function updateCredential(credentialId, updateData) {
+    const existingCredential = await getCredentials(credentialId);
+    if (!existingCredential) {
+        return null;
+    }
+    if (existingCredential.isManaged) {
+        throw new CredentialsIsNotUpdatableError('Managed credentials cannot be updated.');
+    }
+    const credentialData = {};
+    if (updateData.name !== undefined) {
+        credentialData.name = updateData.name;
+    }
+    if (updateData.type !== undefined) {
+        credentialData.type = updateData.type;
+    }
+    if (updateData.data !== undefined) {
+        if (updateData.data?.oauthTokenData) {
+            delete updateData.data.oauthTokenData;
+        }
+        const credentialsService = di_1.Container.get(credentials_service_1.CredentialsService);
+        const decryptedData = credentialsService.decrypt(existingCredential, true);
+        let dataToEncrypt;
+        if (updateData.isPartialData === true) {
+            const mergedData = {
+                ...decryptedData,
+                ...updateData.data,
+            };
+            dataToEncrypt = credentialsService.unredact(mergedData, decryptedData);
+        }
+        else {
+            dataToEncrypt = updateData.data;
+        }
+        if (decryptedData.oauthTokenData) {
+            dataToEncrypt.oauthTokenData = decryptedData.oauthTokenData;
+        }
+        const newCredential = new db_1.CredentialsEntity();
+        Object.assign(newCredential, {
+            id: credentialId,
+            name: updateData.name ?? existingCredential.name,
+            type: updateData.type ?? existingCredential.type,
+            data: dataToEncrypt,
+        });
+        const encryptedData = await encryptCredential(newCredential);
+        Object.assign(credentialData, encryptedData);
+    }
+    if (updateData.isResolvable !== undefined) {
+        credentialData.isResolvable = updateData.isResolvable;
+    }
+    if (updateData.isGlobal !== undefined) {
+        credentialData.isGlobal = updateData.isGlobal;
+    }
+    credentialData.updatedAt = new Date();
+    await di_1.Container.get(db_1.CredentialsRepository).update(credentialId, credentialData);
+    return await getCredentials(credentialId);
+}
 async function removeCredential(user, credentials) {
     await di_1.Container.get(external_hooks_1.ExternalHooks).run('credentials.delete', [credentials.id]);
     di_1.Container.get(event_service_1.EventService).emit('credentials-deleted', {

package/dist/public-api/v1/handlers/credentials/credentials.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"credentials.service.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.service.ts"],"names":[],"mappings":"~~;;AAuBA~~,wCAEC;AAED,oDAWC;AAED,4CAQC;AAED,wCA8CC;AAED,4CAWC;AAED,8CAQC;AAOD,kDAYC;AASD,oCA8KC;~~AAhUD~~,gCAMiB;AACjB,gCAAoC;AACpC,uCAAuC;~~AAQvC~~,0DAAsD;AACtD,qDAAiD;~~AAK1C~~,KAAK,UAAU,cAAc,CAAC,YAAoB;IACxD,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,0BAAqB,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;AACnF,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACzC,MAAc,EACd,YAAoB;IAEpB,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,gCAA2B,CAAC,CAAC,OAAO,CAAC;QAC/D,KAAK,EAAE;YACN,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,MAAM,EAAE,EAAE;YACzC,aAAa,EAAE,YAAY;SAC3B;QACD,SAAS,EAAE,CAAC,aAAa,CAAC;KAC1B,CAAC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,gBAAgB,CACrC,UAAkD;IAElD,MAAM,aAAa,GAAG,IAAI,sBAAiB,EAAE,CAAC;IAE9C,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAEzC,OAAO,aAAa,CAAC;AACtB,CAAC;AAEM,KAAK,UAAU,cAAc,CACnC,UAA6B,EAC7B,IAAU,EACV,aAA6B;IAE7B,MAAM,iBAAiB,GAAG,cAAS,CAAC,GAAG,CAAC,sBAAiB,CAAC,CAAC;IAC3D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,iBAAiB,CAAC;IACjD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;QACvE,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAoB,UAAU,CAAC,CAAC;QAErF,eAAe,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAEvC,MAAM,mBAAmB,GAAG,IAAI,sBAAiB,EAAE,CAAC;QAEpD,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAAC,+BAA+B,CAC9E,IAAI,CAAC,EAAE,EACP,kBAAkB,CAClB,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE;YAClC,IAAI,EAAE,kBAAkB;YACxB,WAAW,EAAE,eAAe;YAC5B,SAAS,EAAE,eAAe,CAAC,EAAE;SAC7B,CAAC,CAAC;QAEH,MAAM,kBAAkB,CAAC,IAAI,CAAoB,mBAAmB,CAAC,CAAC;QAEtE,OAAO,eAAe,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,MAAM,cAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAE9E,MAAM,OAAO,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,gCAA2B,CAAC,CAAC,2BAA2B,CAC3F,UAAU,CAAC,EAAE,CACb,CAAC;IAEF,cAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAAE;QACvD,IAAI;QACJ,cAAc,EAAE,UAAU,CAAC,IAAI;QAC/B,YAAY,EAAE,UAAU,CAAC,EAAE;QAC3B,SAAS,EAAE,OAAO,EAAE,EAAE;QACtB,WAAW,EAAE,OAAO,EAAE,IAAI;QAC1B,SAAS,EAAE,IAAI;KACf,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC;AAEM,KAAK,UAAU,gBAAgB,CACrC,IAAU,EACV,WAA8B;IAE9B,MAAM,cAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/E,cAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAAE;QACvD,IAAI;QACJ,cAAc,EAAE,WAAW,CAAC,IAAI;QAChC,YAAY,EAAE,WAAW,CAAC,EAAE;KAC5B,CAAC,CAAC;IACH,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,0BAAqB,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AACvE,CAAC;AAEM,KAAK,UAAU,iBAAiB,CAAC,UAA6B;IAEpE,MAAM,cAAc,GAAG,IAAI,sBAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAG7F,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAExC,OAAO,cAAc,CAAC,aAAa,EAAoB,CAAC;AACzD,CAAC;AAOD,SAAgB,mBAAmB,CAClC,WAAoD;IAEpD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAEjE,MAAM,oBAAoB,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAC/D,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;QAC7C,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC;AASD,SAAgB,YAAY,CAAC,UAA6B;IACzD,MAAM,UAAU,GAAgB;QAC/B,oBAAoB,EAAE,KAAK;QAC3B,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,EAAE;QACd,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,aAAa,GAAgC,EAAE,CAAC;IACtD,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAIvC,UAAU;SACR,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC;SACjD,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACrB,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC5B,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,MAA4B,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;SACtF,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEJ,IAAI,cAAc,GAAa,EAAE,CAAC;IAElC,MAAM,4BAA4B,GAAmC,EAAE,CAAC;IAOxE,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC/B,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACvB,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAGjC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE;gBACpC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAChB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAA0B,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;iBACvE;aACD,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE;gBACpC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAChB,IAAI,EAAE,QAAQ,CAAC,IAAI;iBACnB;aACD,CAAC,CAAC;QACJ,CAAC;QAMD,IAAI,QAAQ,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC;YACnC,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1E,MAAM,oBAAoB,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACzE,IAAI,cAAc,GAAiD,EAAE,CAAC;YAEtE,IACC,oBAAoB;gBACpB,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC;gBACnC,oBAAoB,CAAC,CAAC,CAAC,KAAK,SAAS;gBACrC,oBAAoB,CAAC,CAAC,CAAC,KAAK,IAAI,EAC/B,CAAC;gBACF,cAAc,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;YAC1C,CAAC;YAKD,MAAM,aAAa,GAAG,GAAG,aAAa,IAAI,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC;YAE3E,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBAChD,IAAI,gBAAgB,CAAC;gBACrB,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC;oBAE/D,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;oBAElE,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;wBAClB,gBAAgB,GAAG;4BAClB,KAAK,EAAE,CAAC,WAAW,CAAC;yBACpB,CAAC;oBACH,CAAC;yBAAM,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;wBAC1B,gBAAgB,GAAG;4BAClB,GAAG,EAAE;gCACJ,KAAK,EAAE,CAAC,WAAW,CAAC;6BACpB;yBACD,CAAC;oBACH,CAAC;yBAAM,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;wBACzB,gBAAgB,GAAG;4BAClB,IAAI,EAAE,QAAQ;4BACd,gBAAgB,EAAE,CAAC,WAAW,CAAC;yBAC/B,CAAC;oBACH,CAAC;yBAAM,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;wBAC1B,gBAAgB,GAAG;4BAClB,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,CAAC,WAAW,CAAC;yBACtB,CAAC;oBACH,CAAC;yBAAM,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;wBACzB,gBAAgB,GAAG;4BAClB,IAAI,EAAE,QAAQ;4BACd,gBAAgB,EAAE,CAAC,WAAW,CAAC;yBAC/B,CAAC;oBACH,CAAC;yBAAM,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;wBAC1B,gBAAgB,GAAG;4BAClB,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,CAAC,WAAW,CAAC;yBACtB,CAAC;oBACH,CAAC;yBAAM,IAAI,GAAG,KAAK,YAAY,EAAE,CAAC;wBACjC,gBAAgB,GAAG;4BAClB,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,IAAI,WAAW,EAAE;yBAC1B,CAAC;oBACH,CAAC;yBAAM,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;wBAC/B,gBAAgB,GAAG;4BAClB,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,GAAG,WAAW,GAAG;yBAC1B,CAAC;oBACH,CAAC;yBAAM,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;wBAC/B,gBAAgB,GAAG;4BAClB,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,GAAG,WAAW,EAAE;yBACzB,CAAC;oBACH,CAAC;yBAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;wBAC5B,gBAAgB,GAAG;4BAClB,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,GAAG,WAAW,EAAE;yBACzB,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACP,gBAAgB,GAAG;4BAClB,IAAI,EAAE,CAAC,cAAc,CAAC;yBACtB,CAAC;oBACH,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,gBAAgB,GAAG;wBAClB,IAAI,EAAE,CAAC,cAAc,CAAC;qBACtB,CAAC;gBACH,CAAC;gBACD,4BAA4B,CAAC,aAAa,CAAC,GAAG;oBAC7C,EAAE,EAAE;wBACH,UAAU,EAAE;4BACX,CAAC,aAAa,CAAC,EAAE,gBAAgB;yBACjC;qBACD;oBACD,IAAI,EAAE;wBACL,KAAK,EAAE,EAAE;qBACT;oBACD,IAAI,EAAE;wBACL,KAAK,EAAE,EAAE;qBACT;iBACD,CAAC;gBACF,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACvC,CAAC;YAED,4BAA4B,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC5F,4BAA4B,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;gBAC5D,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;aAClC,CAAC,CAAC;YAEH,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5E,CAAC;IACF,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;IAExD,UAAU,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;IAE/D,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAC9B,OAAO,UAAU,CAAC,KAAK,CAAC;IACzB,CAAC;IAED,OAAO,UAAoC,CAAC;AAC7C,CAAC"}
1	+ {"version":3,"file":"credentials.service.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.service.ts"],"names":[],"mappings":"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"}

package/dist/public-api/v1/openapi.yml CHANGED Viewed

@@ -105,6 +105,41 @@ paths:
         '415':
           description: Unsupported media type.
   /credentials/{id}:
+    patch:
+      x-eov-operation-id: updateCredential
+      x-eov-operation-handler: v1/handlers/credentials/credentials.handler
+      tags:
+        - Credential
+      summary: Update credential by ID
+      description: Updates an existing credential. You must be the owner of the credential.
+      operationId: updateCredential
+      parameters:
+        - name: id
+          in: path
+          description: The credential ID that needs to be updated
+          required: true
+          schema:
+            type: string
+      requestBody:
+        description: Credential data to update. All fields are optional.
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/update-credential-request'
+      responses:
+        '200':
+          description: Operation successful.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/create-credential-response'
+        '400':
+          description: Bad request - invalid credential type or data.
+        '401':
+          $ref: '#/components/responses/unauthorized'
+        '404':
+          $ref: '#/components/responses/notFound'
     delete:
       x-eov-operation-id: deleteCredential
       x-eov-operation-handler: v1/handlers/credentials/credentials.handler
@@ -1424,6 +1459,36 @@ components:
           format: date-time
           readOnly: true
           example: '2022-04-29T11:02:29.842Z'
+    update-credential-request:
+      type: object
+      properties:
+        name:
+          type: string
+          example: Updated Credential Name
+          description: The name of the credential
+        type:
+          type: string
+          example: githubApi
+          description: The credential type. If changing type, data must also be provided.
+        data:
+          type: object
+          writeOnly: true
+          example:
+            accessToken: new_token_value
+          description: The credential data. Required when changing credential type.
+        isGlobal:
+          type: boolean
+          example: false
+          description: Whether this credential is available globally
+        isResolvable:
+          type: boolean
+          example: false
+          description: Whether this credential has resolvable fields
+        isPartialData:
+          type: boolean
+          example: false
+          default: false
+          description: If true, unredacts and merges existing credential data with the provided data. If false, replaces the entire data object.
     execution:
       type: object
       properties:

package/dist/scaling/pubsub/publisher.service.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Logger } from '@n8n/backend-common';
-import { ExecutionsConfig } from '@n8n/config';
+import { ExecutionsConfig, GlobalConfig } from '@n8n/config';
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
 import { InstanceSettings } from 'n8n-core';
 import { RedisClientService } from '../../services/redis-client.service';
@@ -9,8 +9,11 @@ export declare class Publisher {
     private readonly redisClientService;
     private readonly instanceSettings;
     private readonly executionsConfig;
+    private readonly globalConfig;
     private readonly client;
-    constructor(logger: Logger, redisClientService: RedisClientService, instanceSettings: InstanceSettings, executionsConfig: ExecutionsConfig);
+    private readonly commandChannel;
+    private readonly workerResponseChannel;
+    constructor(logger: Logger, redisClientService: RedisClientService, instanceSettings: InstanceSettings, executionsConfig: ExecutionsConfig, globalConfig: GlobalConfig);
     getClient(): SingleNodeClient | MultiNodeClient;
     shutdown(): void;
     publishCommand(msg: PubSub.Command): Promise<void>;

package/dist/scaling/pubsub/publisher.service.js CHANGED Viewed

@@ -17,14 +17,18 @@ const n8n_core_1 = require("n8n-core");
 const redis_client_service_1 = require("../../services/redis-client.service");
 const constants_1 = require("../constants");
 let Publisher = class Publisher {
-    constructor(logger, redisClientService, instanceSettings, executionsConfig) {
+    constructor(logger, redisClientService, instanceSettings, executionsConfig, globalConfig) {
         this.logger = logger;
         this.redisClientService = redisClientService;
         this.instanceSettings = instanceSettings;
         this.executionsConfig = executionsConfig;
+        this.globalConfig = globalConfig;
         if (this.executionsConfig.mode !== 'queue')
             return;
         this.logger = this.logger.scoped(['scaling', 'pubsub']);
+        const prefix = this.globalConfig.redis.prefix;
+        this.commandChannel = `${prefix}:${constants_1.COMMAND_PUBSUB_CHANNEL}`;
+        this.workerResponseChannel = `${prefix}:${constants_1.WORKER_RESPONSE_PUBSUB_CHANNEL}`;
         this.client = this.redisClientService.createClient({ type: 'publisher(n8n)' });
     }
     getClient() {
@@ -36,14 +40,14 @@ let Publisher = class Publisher {
     async publishCommand(msg) {
         if (this.executionsConfig.mode !== 'queue')
             return;
-        await this.client.publish('n8n.commands', JSON.stringify({
+        await this.client.publish(this.commandChannel, JSON.stringify({
             ...msg,
             senderId: this.instanceSettings.hostId,
             selfSend: constants_1.SELF_SEND_COMMANDS.has(msg.command),
             debounce: !constants_1.IMMEDIATE_COMMANDS.has(msg.command),
         }));
         let msgName = msg.command;
-        const metadata = { msg: msg.command, channel: 'n8n.commands' };
+        const metadata = { msg: msg.command, channel: this.commandChannel };
         if (msg.command === 'relay-execution-lifecycle-event') {
             const { data, type } = msg.payload;
             msgName += ` (${type})`;
@@ -54,7 +58,7 @@ let Publisher = class Publisher {
         this.logger.debug(`Published pubsub msg: ${msgName}`, metadata);
     }
     async publishWorkerResponse(msg) {
-        await this.client.publish('n8n.worker-response', JSON.stringify(msg));
+        await this.client.publish(this.workerResponseChannel, JSON.stringify(msg));
         this.logger.debug(`Published ${msg.response} to worker response channel`);
     }
     async setIfNotExists(key, value, ttl) {
@@ -77,6 +81,7 @@ exports.Publisher = Publisher = __decorate([
     __metadata("design:paramtypes", [backend_common_1.Logger,
         redis_client_service_1.RedisClientService,
         n8n_core_1.InstanceSettings,
-        config_1.ExecutionsConfig])
+        config_1.ExecutionsConfig,
+        config_1.GlobalConfig])
 ], Publisher);
 //# sourceMappingURL=publisher.service.js.map

package/dist/scaling/pubsub/publisher.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,~~wCAA+C~~;~~AAC/C~~,gCAAkC;AAElC,uCAA4C;AAG5C,0EAAqE;AAGrE,~~4CAAsE~~;~~AAM/D~~,IAAM,SAAS,GAAf,MAAM,SAAS;~~IAKrB~~,YACkB,MAAc,EACd,kBAAsC,EACtC,gBAAkC,EAClC,gBAAkC;~~QAHlC~~,WAAM,GAAN,MAAM,CAAQ;QACd,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,qBAAgB,GAAhB,gBAAgB,CAAkB;~~QAGnD~~,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QAEnD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;~~QAExD~~,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAOD,KAAK,CAAC,cAAc,CAAC,GAAmB;QAEvC,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QAEnD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CACxB,cAAc,~~EACd~~,IAAI,CAAC,SAAS,CAAC;YACd,GAAG,GAAG;YACN,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;YACtC,QAAQ,EAAE,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;YAC7C,QAAQ,EAAE,CAAC,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;SAC9C,CAAC,CACF,CAAC;QAEF,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAE1B,MAAM,QAAQ,GAAgB,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;~~QAE5E~~,IAAI,GAAG,CAAC,OAAO,KAAK,iCAAiC,EAAE,CAAC;YACvD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YACnC,OAAO,IAAI,KAAK,IAAI,GAAG,CAAC;YACxB,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,IAAI,aAAa,IAAI,IAAI;gBAAE,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;IACjE,CAAC;IAGD,KAAK,CAAC,qBAAqB,CAAC,GAA0B;QACrD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;~~QAEtE~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,QAAQ,6BAA6B,CAAC,CAAC;IAC3E,CAAC;IAQD,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,KAAa,EAAE,GAAW;QAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAClE,OAAO,MAAM,KAAK,IAAI,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,GAAW;QAC3C,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW;QACtB,MAAM,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CAGD,CAAA;~~AA5FY~~,8BAAS;oBAAT,SAAS;IADrB,IAAA,YAAO,GAAE;~~qCAOiB~~,uBAAM;QACM,yCAAkB;QACpB,2BAAgB;QAChB,yBAAgB;~~GATxC~~,SAAS,~~CA4FrB~~"}
1	+ {"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":"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"}

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

@@ -1,20 +1,24 @@
 import { Logger } from '@n8n/backend-common';
-import { ExecutionsConfig } from '@n8n/config';
+import { ExecutionsConfig, GlobalConfig } from '@n8n/config';
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
 import { InstanceSettings } from 'n8n-core';
 import { RedisClientService } from '../../services/redis-client.service';
 import { PubSubEventBus } from './pubsub.eventbus';
-import type { PubSub } from './pubsub.types';
 export declare class Subscriber {
     private readonly logger;
     private readonly instanceSettings;
     private readonly pubsubEventBus;
     private readonly redisClientService;
     private readonly executionsConfig;
+    private readonly globalConfig;
     private readonly client;
-    constructor(logger: Logger, instanceSettings: InstanceSettings, pubsubEventBus: PubSubEventBus, redisClientService: RedisClientService, executionsConfig: ExecutionsConfig);
+    private readonly commandChannel;
+    private readonly workerResponseChannel;
+    constructor(logger: Logger, instanceSettings: InstanceSettings, pubsubEventBus: PubSubEventBus, redisClientService: RedisClientService, executionsConfig: ExecutionsConfig, globalConfig: GlobalConfig);
     getClient(): SingleNodeClient | MultiNodeClient;
+    getCommandChannel(): string;
+    getWorkerResponseChannel(): string;
     shutdown(): void;
-    subscribe(channel: PubSub.Channel): Promise<void>;
+    subscribe(channel: string): Promise<void>;
     private parseMessage;
 }