@crowdin/app-project-module 2.9.0 → 2.10.0

package/out/index.d.ts

@@ -5,6 +5,8 @@ import { getRequestCredentialsMasker, postRequestCredentialsMasker, maskKey } fr
 export { getRequestCredentialsMasker, postRequestCredentialsMasker, maskKey };
 export * from './types';
 export { Cron } from './util/cron';
+/** for app code that fans work out inside one request or job: each branch opens its own log scope */
+export { runWithContext } from '@crowdin/logs-formatter';
 export { express };
 export { reportInsight as reportAdvisorInsight } from './modules/advisor-inspector/report-insight';
 export declare const metadataStore: CrowdinMetadataStore;

package/out/index.js

@@ -48,7 +48,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.metadataStore = exports.reportAdvisorInsight = exports.express = exports.maskKey = exports.postRequestCredentialsMasker = exports.getRequestCredentialsMasker = void 0;
+exports.metadataStore = exports.reportAdvisorInsight = exports.express = exports.runWithContext = exports.maskKey = exports.postRequestCredentialsMasker = exports.getRequestCredentialsMasker = void 0;
 exports.createApp = createApp;
 exports.addCrowdinEndpoints = addCrowdinEndpoints;
 const logsFormatter = __importStar(require("@crowdin/logs-formatter"));
@@ -111,6 +111,9 @@ const automationAction = __importStar(require("./modules/automation-action"));
 const authGuard = __importStar(require("./modules/auth-guard"));
 const subscription_1 = require("./util/subscription");
 __exportStar(require("./types"), exports);
+/** for app code that fans work out inside one request or job: each branch opens its own log scope */
+var logs_formatter_1 = require("@crowdin/logs-formatter");
+Object.defineProperty(exports, "runWithContext", { enumerable: true, get: function () { return logs_formatter_1.runWithContext; } });
 var report_insight_1 = require("./modules/advisor-inspector/report-insight");
 Object.defineProperty(exports, "reportAdvisorInsight", { enumerable: true, get: function () { return report_insight_1.reportInsight; } });
 exports.metadataStore = {
@@ -159,6 +162,12 @@ function addCrowdinEndpoints(app, clientConfig) {
     logger.initialize(config);
     storage.initialize(config);
     cron.initialize(config);
+    // Mounted first, so that even migration and body-parsing failures are attributed to their request
+    if (!config.disableLogsFormatter) {
+        logsFormatter.setup({ appIdentifier: config.identifier });
+        logsFormatter.registerSanitizer(log_sanitizer_1.crowdinLogSanitizer);
+        app.use(logsFormatter.contextResolverMiddleware());
+    }
     // Middleware to ensure delayed migration before handling requests
     app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
         try {
@@ -185,9 +194,7 @@ function addCrowdinEndpoints(app, clientConfig) {
         }
     });
     if (!config.disableLogsFormatter) {
-        logsFormatter.setup();
-        logsFormatter.registerSanitizer(log_sanitizer_1.crowdinLogSanitizer);
-        app.use(logsFormatter.contextResolverMiddleware());
+        // stays after body parsing: it serves POST /_/log from req.body
         app.use(logsFormatter.expressMiddleware());
     }
     app.use('/assets', (0, static_files_1.serveStatic)(config, config.assetsPath || 'static'));

package/out/modules/integration/util/context.d.ts

@@ -0,0 +1,11 @@
+import { CrowdinContextInfo, CrowdinCredentials } from '../../../types';
+import { IntegrationCredentials } from '../types';
+/**
+ * Background work (crons, webhooks, job re-runs) has no JWT - this builds the equivalent context
+ * from stored credentials, so the same consumers (logging, client preparation) work either way.
+ */
+export declare function crowdinContextInfoFromCredentials({ projectId, crowdinCredentials, integrationCredentials, }: {
+    projectId: number;
+    crowdinCredentials: CrowdinCredentials;
+    integrationCredentials?: IntegrationCredentials;
+}): CrowdinContextInfo;

package/out/modules/integration/util/context.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.crowdinContextInfoFromCredentials = crowdinContextInfoFromCredentials;
+/**
+ * Background work (crons, webhooks, job re-runs) has no JWT - this builds the equivalent context
+ * from stored credentials, so the same consumers (logging, client preparation) work either way.
+ */
+function crowdinContextInfoFromCredentials({ projectId, crowdinCredentials, integrationCredentials, }) {
+    return Object.assign({ jwtPayload: {
+            context: {
+                project_id: projectId,
+                organization_id: crowdinCredentials.organizationId,
+                organization_domain: crowdinCredentials.domain,
+                user_id: crowdinCredentials.userId,
+            },
+        }, crowdinId: crowdinCredentials.id }, ((integrationCredentials === null || integrationCredentials === void 0 ? void 0 : integrationCredentials.id) && { clientId: integrationCredentials.id }));
+}

package/out/modules/integration/util/cron.js

@@ -15,6 +15,7 @@ exports.filesCron = filesCron;
 exports.filterFilesFromIntegrationRequest = filterFilesFromIntegrationRequest;
 exports.createOrUpdateSyncSettings = createOrUpdateSyncSettings;
 exports.removeFinishedJobs = removeFinishedJobs;
+const logs_formatter_1 = require("@crowdin/logs-formatter");
 const storage_1 = require("../../../storage");
 const util_1 = require("../../../util");
 const token_1 = require("../../../util/app-functions/token");
@@ -22,50 +23,72 @@ const connection_1 = require("../../../util/connection");
 const logger_1 = require("../../../util/logger");
 const subscription_1 = require("../../../util/subscription");
 const types_1 = require("../types");
+const context_1 = require("./context");
 const defaults_1 = require("./defaults");
 const files_1 = require("./files");
 const job_1 = require("./job");
 const snapshot_1 = require("./snapshot");
 const types_2 = require("./types");
+// Maximum number of organizations processed concurrently during a cron run.
+// Keeps DB connection and API usage bounded regardless of how many orgs are registered.
+const CRON_ORG_CONCURRENCY = (0, util_1.getEnvInt)('CRON_ORG_CONCURRENCY', 5);
+function runJobForOrganization(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ config, integration, job, crowdinCredentials, }) {
+        const { token, client: crowdinClient } = yield (0, connection_1.prepareCrowdinClient)({
+            config,
+            credentials: crowdinCredentials,
+            autoRenew: true,
+        });
+        const { expired } = yield (0, subscription_1.checkSubscription)({
+            config,
+            token,
+            organization: crowdinCredentials.id,
+            accountType: crowdinCredentials.type,
+        });
+        if (expired) {
+            (0, logger_1.log)(`Subscription expired. Skipping job [${job.expression}] for organization ${crowdinCredentials.id}`);
+            return;
+        }
+        const integrationCredentialsList = yield (0, storage_1.getStorage)().getAllIntegrationCredentials(crowdinCredentials.id);
+        const allIntegrationConfigs = yield (0, storage_1.getStorage)().getAllIntegrationConfigs(crowdinCredentials.id);
+        for (const integrationCredentials of integrationCredentialsList) {
+            const integrationConfig = allIntegrationConfigs.find(({ integrationId }) => integrationId === integrationCredentials.id);
+            const projectId = (0, token_1.getProjectId)(integrationCredentials.id);
+            (0, logger_1.setLogCrowdinContext)((0, context_1.crowdinContextInfoFromCredentials)({ projectId, crowdinCredentials, integrationCredentials }));
+            const credentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
+            const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
+            const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config) ? JSON.parse(integrationConfig.config) : undefined;
+            (0, logger_1.log)(`Executing task for cron job with expression [${job.expression}] for project ${projectId}`);
+            yield job.task({
+                projectId,
+                client: crowdinClient,
+                credentials,
+                rootFolder,
+                settings: intConfig,
+            });
+            (0, logger_1.log)(`Task for cron job with expression [${job.expression}] for project ${projectId} completed`);
+        }
+    });
+}
 function runJob(_a) {
     return __awaiter(this, arguments, void 0, function* ({ config, integration, job, }) {
         (0, logger_1.log)(`Starting cron job with expression [${job.expression}]`);
         const crowdinCredentialsList = yield (0, storage_1.getStorage)().getAllCrowdinCredentials();
-        yield Promise.all(crowdinCredentialsList.map((crowdinCredentials) => __awaiter(this, void 0, void 0, function* () {
-            const { token, client: crowdinClient } = yield (0, connection_1.prepareCrowdinClient)({
-                config,
-                credentials: crowdinCredentials,
-                autoRenew: true,
-            });
-            const { expired } = yield (0, subscription_1.checkSubscription)({
-                config,
-                token,
-                organization: crowdinCredentials.id,
-                accountType: crowdinCredentials.type,
+        for (let i = 0; i < crowdinCredentialsList.length; i += CRON_ORG_CONCURRENCY) {
+            const batch = crowdinCredentialsList.slice(i, i + CRON_ORG_CONCURRENCY);
+            const results = yield Promise.allSettled(
+            // per-organization scope, for the same reason processSyncSettings opens one per branch
+            batch.map((crowdinCredentials) => (0, logs_formatter_1.runWithContext)((0, logger_1.logContext)(crowdinCredentials), () => runJobForOrganization({ config, integration, job, crowdinCredentials }))));
+            results.forEach((result, index) => {
+                if (result.status === 'rejected') {
+                    // the rejection landed here, outside the branch's scope, so reopen its tenant
+                    (0, logs_formatter_1.runWithContext)((0, logger_1.logContext)(batch[index]), () => {
+                        (0, logger_1.log)(`Cron job with expression [${job.expression}] failed for organization '${batch[index].id}'`);
+                        (0, logger_1.logError)(result.reason);
+                    });
+                }
             });
-            if (expired) {
-                (0, logger_1.log)(`Subscription expired. Skipping job [${job.expression}] for organization ${crowdinCredentials.id}`);
-                return;
-            }
-            const integrationCredentialsList = yield (0, storage_1.getStorage)().getAllIntegrationCredentials(crowdinCredentials.id);
-            const allIntegrationConfigs = yield (0, storage_1.getStorage)().getAllIntegrationConfigs(crowdinCredentials.id);
-            for (const integrationCredentials of integrationCredentialsList) {
-                const integrationConfig = allIntegrationConfigs.find(({ integrationId }) => integrationId === integrationCredentials.id);
-                const projectId = (0, token_1.getProjectId)(integrationCredentials.id);
-                const credentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
-                const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
-                const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config) ? JSON.parse(integrationConfig.config) : undefined;
-                (0, logger_1.log)(`Executing task for cron job with expression [${job.expression}] for project ${projectId}`);
-                yield job.task({
-                    projectId,
-                    client: crowdinClient,
-                    credentials,
-                    rootFolder,
-                    settings: intConfig,
-                });
-                (0, logger_1.log)(`Task for cron job with expression [${job.expression}] for project ${projectId} completed`);
-            }
-        })));
+        }
         (0, logger_1.log)(`Cron job with expression [${job.expression}] completed`);
     });
 }
@@ -135,22 +158,27 @@ function filesCron(_a) {
         const syncSettingsList = yield (0, storage_1.getStorage)().getSyncSettingsBySchedule('schedule', period);
         const crowdinSyncSettings = syncSettingsList.filter((syncSettings) => syncSettings.provider === types_1.Provider.CROWDIN);
         const integrationSyncSettings = syncSettingsList.filter((syncSettings) => syncSettings.provider === types_1.Provider.INTEGRATION);
-        const crowdinResults = yield Promise.allSettled(crowdinSyncSettings.map((syncSettings) => processSyncSettings({ config, integration, period, syncSettings })));
-        crowdinResults.forEach((result) => {
-            if (result.status === 'rejected') {
-                (0, logger_1.logError)(result.reason);
-            }
-        });
-        const integrationResults = yield Promise.allSettled(integrationSyncSettings.map((syncSettings) => processSyncSettings({ config, integration, period, syncSettings })));
-        integrationResults.forEach((result) => {
-            if (result.status === 'rejected') {
-                (0, logger_1.logError)(result.reason);
-            }
-        });
+        yield Promise.all(crowdinSyncSettings.map((syncSettings) => processSyncSettings({ config, integration, period, syncSettings })));
+        yield Promise.all(integrationSyncSettings.map((syncSettings) => processSyncSettings({ config, integration, period, syncSettings })));
         (0, logger_1.log)(`Files cron job with period [${period}] completed`);
     });
 }
-function processSyncSettings(_a) {
+/**
+ * Each branch of the fan-out gets a scope of its own: the tick's scope is shared by every tenant
+ * due for sync, so a context written there stamps the other tenants' log lines.
+ */
+function processSyncSettings(params) {
+    return (0, logs_formatter_1.runWithContext)({}, () => __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield processSyncSettingsScoped(params);
+        }
+        catch (e) {
+            (0, logger_1.log)(`Files sync failed for organization '${params.syncSettings.crowdinId}'`);
+            (0, logger_1.logError)(e);
+        }
+    }));
+}
+function processSyncSettingsScoped(_a) {
     return __awaiter(this, arguments, void 0, function* ({ config, integration, period, syncSettings, }) {
         var _b, _c, _d, _e;
         let projectData;
@@ -171,18 +199,8 @@ function processSyncSettings(_a) {
             return;
         }
         const projectId = (0, token_1.getProjectId)(integrationCredentials.id);
-        const context = {
-            jwtPayload: {
-                context: {
-                    project_id: projectId,
-                    organization_id: crowdinCredentials.organizationId,
-                    organization_domain: crowdinCredentials.domain,
-                    user_id: crowdinCredentials.userId,
-                },
-            },
-            crowdinId: crowdinCredentials.id,
-            clientId: integrationCredentials.id,
-        };
+        const context = (0, context_1.crowdinContextInfoFromCredentials)({ projectId, crowdinCredentials, integrationCredentials });
+        (0, logger_1.setLogCrowdinContext)(context);
         const logInfo = (0, logger_1.withContext)(context);
         try {
             const preparedCrowdinClient = yield (0, connection_1.prepareCrowdinClient)({

package/out/modules/integration/util/job.js

@@ -11,10 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runAsJob = runAsJob;
 exports.reRunInProgressJobs = reRunInProgressJobs;
+const logs_formatter_1 = require("@crowdin/logs-formatter");
 const storage_1 = require("../../../storage");
 const token_1 = require("../../../util/app-functions/token");
 const connection_1 = require("../../../util/connection");
+const util_1 = require("../../../util");
 const logger_1 = require("../../../util/logger");
+const context_1 = require("./context");
 const cron_1 = require("./cron");
 const defaults_1 = require("./defaults");
 const types_1 = require("./types");
@@ -27,7 +30,12 @@ const blockingJobs = {
     [types_1.JobType.INTEGRATION_SETTINGS_SAVE]: [types_1.JobType.INTEGRATION_SETTINGS_SAVE],
 };
 const maxAttempts = 3;
-const store = {};
+// Maximum number of in-progress jobs retried concurrently on startup.
+const RERUN_JOB_CONCURRENCY = (0, util_1.getEnvInt)('RERUN_JOB_CONCURRENCY', 5);
+// Maximum total etag entries held in the in-memory translation cache.
+const TRANSLATION_CACHE_MAX = (0, util_1.getEnvInt)('TRANSLATION_CACHE_SIZE', 50000);
+let store = {};
+let storeSize = 0;
 function runAsJob(_a) {
     return __awaiter(this, arguments, void 0, function* ({ integrationId, crowdinId, type, title, payload, res, projectId, client, jobType, jobStoreType, responseData, jobCallback, onError, reRunJobId, forcePushTranslations, initiatedBy, }) {
         let jobId;
@@ -101,22 +109,22 @@ function runAsJob(_a) {
                         yield storage.saveTranslationCache({ integrationId, crowdinId, fileId, languageId });
                     }
                     else {
+                        if (storeSize >= TRANSLATION_CACHE_MAX) {
+                            (0, logger_1.log)(`Translation etag cache reached limit of ${TRANSLATION_CACHE_MAX} entries, clearing`);
+                            store = {};
+                            storeSize = 0;
+                        }
                         if (!store[integrationId]) {
                             store[integrationId] = {};
                         }
                         if (!store[integrationId][crowdinId]) {
-                            store[integrationId] = {
-                                [crowdinId]: {},
-                            };
+                            store[integrationId][crowdinId] = {};
                         }
                         if (!store[integrationId][crowdinId][fileId]) {
-                            store[integrationId] = {
-                                [crowdinId]: {
-                                    [fileId]: {},
-                                },
-                            };
+                            store[integrationId][crowdinId][fileId] = {};
                         }
                         store[integrationId][crowdinId][fileId][languageId] = {};
+                        storeSize++;
                     }
                 }
                 let translation = null;
@@ -212,81 +220,92 @@ function runAsJob(_a) {
         }
     });
 }
+function reRunJob(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ config, activeJob }) {
+        const storage = (0, storage_1.getStorage)();
+        if (activeJob && ![types_1.JobStatus.IN_PROGRESS, types_1.JobStatus.CREATED].includes(activeJob.status)) {
+            return;
+        }
+        if (activeJob.attempt && activeJob.attempt >= maxAttempts) {
+            yield storage.updateJob({ id: activeJob.id, status: types_1.JobStatus.FAILED });
+            return;
+        }
+        const { integrationId, crowdinId, type, title, payload } = activeJob;
+        const integration = config.projectIntegration;
+        let crowdinClient;
+        const integrationCredentials = yield storage.getIntegrationCredentials(integrationId);
+        const crowdinCredentials = yield storage.getCrowdinCredentials(crowdinId);
+        const integrationConfig = yield storage.getIntegrationConfig(integrationId);
+        if (!integrationCredentials || !crowdinCredentials) {
+            return;
+        }
+        const projectId = (0, token_1.getProjectId)(integrationCredentials.id);
+        const context = (0, context_1.crowdinContextInfoFromCredentials)({
+            projectId,
+            crowdinCredentials,
+            integrationCredentials,
+        });
+        (0, logger_1.setLogCrowdinContext)(context);
+        try {
+            const preparedCrowdinClient = yield (0, connection_1.prepareCrowdinClient)({
+                config,
+                credentials: crowdinCredentials,
+                autoRenew: true,
+                context,
+            });
+            crowdinClient = preparedCrowdinClient.client;
+        }
+        catch (e) {
+            (0, logger_1.logError)(e);
+            return;
+        }
+        const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
+        const credentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
+        const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config)
+            ? JSON.parse(integrationConfig.config)
+            : { schedule: '0', condition: '0' };
+        yield storage.updateJob({ attempt: +(activeJob.attempt || 0) + 1, id: activeJob.id });
+        if ([types_1.JobType.UPDATE_TO_CROWDIN, types_1.JobType.UPDATE_TO_INTEGRATION].includes(type)) {
+            yield (0, cron_1.runUpdateProviderJob)({
+                integrationId,
+                crowdinId,
+                type,
+                title,
+                payload: JSON.parse(payload),
+                jobType: types_1.JobClientType.RERUN,
+                projectId,
+                client: crowdinClient,
+                integration,
+                context,
+                credentials,
+                rootFolder,
+                settings: intConfig,
+                reRunJobId: activeJob.id,
+            });
+        }
+        else if ([types_1.JobType.CROWDIN_SYNC_SETTINGS_SAVE, types_1.JobType.INTEGRATION_SYNC_SETTINGS_SAVE].includes(type)) {
+            yield storage.updateJob({ status: types_1.JobStatus.CANCELED, id: activeJob.id });
+        }
+    });
+}
 function reRunInProgressJobs(config) {
     return __awaiter(this, void 0, void 0, function* () {
-        const storage = (0, storage_1.getStorage)();
-        const inProgressJobs = yield storage.getAllInProgressJobs();
+        const inProgressJobs = yield (0, storage_1.getStorage)().getAllInProgressJobs();
         if (!(inProgressJobs === null || inProgressJobs === void 0 ? void 0 : inProgressJobs.length)) {
             return;
         }
-        yield Promise.all(inProgressJobs.map((activeJob) => __awaiter(this, void 0, void 0, function* () {
-            if (activeJob && ![types_1.JobStatus.IN_PROGRESS, types_1.JobStatus.CREATED].includes(activeJob.status)) {
-                return;
-            }
-            if (activeJob.attempt && activeJob.attempt >= maxAttempts) {
-                yield storage.updateJob({ id: activeJob.id, status: types_1.JobStatus.FAILED });
-                return;
-            }
-            const { integrationId, crowdinId, type, title, payload } = activeJob;
-            const integration = config.projectIntegration;
-            let crowdinClient;
-            const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(integrationId);
-            const crowdinCredentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(crowdinId);
-            const integrationConfig = yield (0, storage_1.getStorage)().getIntegrationConfig(integrationId);
-            if (!integrationCredentials || !crowdinCredentials) {
-                return;
-            }
-            const projectId = (0, token_1.getProjectId)(integrationCredentials.id);
-            const context = {
-                jwtPayload: {
-                    context: {
-                        project_id: projectId,
-                        organization_id: crowdinCredentials.organizationId,
-                        organization_domain: crowdinCredentials.domain,
-                        user_id: crowdinCredentials.userId,
-                    },
-                },
-            };
-            try {
-                const preparedCrowdinClient = yield (0, connection_1.prepareCrowdinClient)({
-                    config,
-                    credentials: crowdinCredentials,
-                    autoRenew: true,
-                    context,
-                });
-                crowdinClient = preparedCrowdinClient.client;
-            }
-            catch (e) {
-                (0, logger_1.logError)(e);
-                return;
-            }
-            const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
-            const credentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
-            const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config)
-                ? JSON.parse(integrationConfig.config)
-                : { schedule: '0', condition: '0' };
-            yield storage.updateJob({ attempt: +(activeJob.attempt || 0) + 1, id: activeJob.id });
-            if ([types_1.JobType.UPDATE_TO_CROWDIN, types_1.JobType.UPDATE_TO_INTEGRATION].includes(type)) {
-                yield (0, cron_1.runUpdateProviderJob)({
-                    integrationId,
-                    crowdinId,
-                    type,
-                    title,
-                    payload: JSON.parse(payload),
-                    jobType: types_1.JobClientType.RERUN,
-                    projectId,
-                    client: crowdinClient,
-                    integration,
-                    context,
-                    credentials,
-                    rootFolder,
-                    settings: intConfig,
-                    reRunJobId: activeJob.id,
-                });
-            }
-            else if ([types_1.JobType.CROWDIN_SYNC_SETTINGS_SAVE, types_1.JobType.INTEGRATION_SYNC_SETTINGS_SAVE].includes(type)) {
-                yield storage.updateJob({ status: types_1.JobStatus.CANCELED, id: activeJob.id });
-            }
-        })));
+        for (let i = 0; i < inProgressJobs.length; i += RERUN_JOB_CONCURRENCY) {
+            const batch = inProgressJobs.slice(i, i + RERUN_JOB_CONCURRENCY);
+            yield Promise.all(
+            // re-runs start at app.listen, outside any request, so each job gets a scope of its own
+            batch.map((activeJob) => (0, logs_formatter_1.runWithContext)({}, () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield reRunJob({ config, activeJob });
+                }
+                catch (e) {
+                    (0, logger_1.logError)(e);
+                }
+            }))));
+        }
     });
 }

package/out/modules/integration/util/webhooks.d.ts

@@ -1,4 +1,5 @@
 import Crowdin from '@crowdin/crowdin-api-client';
+import { Channel, ConsumeMessage } from 'amqplib';
 import { Config, CrowdinContextInfo } from '../../../types';
 import { AppSettings, IntegrationLogic, IntegrationSyncSettings, Provider, UpdateCrowdinWebhookPayloadsArgs } from '../types';
 export declare const HookEvents: any;
@@ -35,6 +36,7 @@ export declare function prepareWebhookData({ config, integration, provider, webh
     settings: AppSettings;
     syncSettings: null;
     preparedIntegrationCredentials: null;
+    logContext?: undefined;
 } | {
     projectId: number;
     crowdinClient: {
@@ -45,6 +47,7 @@ export declare function prepareWebhookData({ config, integration, provider, webh
     rootFolder: import("@crowdin/crowdin-api-client").SourceFilesModel.Directory | undefined;
     settings: AppSettings;
     syncSettings: IntegrationSyncSettings | null;
+    logContext: import("@crowdin/logs-formatter").Context;
 }>;
 export declare function updateCrowdinFromWebhookRequest(args: UpdateCrowdinWebhookPayloadsArgs): Promise<void>;
 export declare function listenQueueMessage({ config, integration, queueName, queueUrl, }: {
@@ -53,3 +56,11 @@ export declare function listenQueueMessage({ config, integration, queueName, que
     queueUrl: string;
     queueName: string;
 }): Promise<void>;
+export declare function processMessages({ channel, messagesToAck, webhooksData, webhooksInfo, }: {
+    webhooksData: Promise<void>[];
+    webhooksInfo: {
+        [key: string]: any;
+    };
+    channel: Channel;
+    messagesToAck: ConsumeMessage[];
+}): Promise<void>;