@crowdin/app-project-module 0.63.2 → 0.65.0

package/out/index.d.ts

@@ -1,6 +1,8 @@
 import { Express } from 'express';
 import { ClientConfig, Config, CrowdinAppUtilities, CrowdinMetadataStore } from './types';
 import express from './util/terminus-express';
+import { getRequestCredentialsMasker, postRequestCredentialsMasker } from './util/credentials-masker';
+export { getRequestCredentialsMasker, postRequestCredentialsMasker };
 export { ProjectPermissions, Scope, UserPermissions } from './types';
 export { express };
 export declare const metadataStore: CrowdinMetadataStore;

package/out/index.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addCrowdinEndpoints = exports.createApp = exports.metadataStore = exports.express = exports.UserPermissions = exports.Scope = exports.ProjectPermissions = void 0;
+exports.addCrowdinEndpoints = exports.createApp = exports.metadataStore = exports.express = exports.UserPermissions = exports.Scope = exports.ProjectPermissions = exports.postRequestCredentialsMasker = exports.getRequestCredentialsMasker = void 0;
 const logsFormatter = __importStar(require("@crowdin/logs-formatter"));
 const path_1 = require("path");
 const crowdin_client_1 = __importStar(require("./middlewares/crowdin-client"));
@@ -57,6 +57,8 @@ const logger_1 = require("./util/logger");
 const terminus_express_1 = __importDefault(require("./util/terminus-express"));
 exports.express = terminus_express_1.default;
 const credentials_masker_1 = require("./util/credentials-masker");
+Object.defineProperty(exports, "getRequestCredentialsMasker", { enumerable: true, get: function () { return credentials_masker_1.getRequestCredentialsMasker; } });
+Object.defineProperty(exports, "postRequestCredentialsMasker", { enumerable: true, get: function () { return credentials_masker_1.postRequestCredentialsMasker; } });
 //apps
 const apiApp = __importStar(require("./modules/api"));
 const contextMenuApp = __importStar(require("./modules/context-menu"));
@@ -109,7 +111,7 @@ function createApp(clientConfig) {
     const config = convertClientConfig(clientConfig);
     addCrowdinEndpoints(app, config);
     /* eslint no-console: "off" */
-    app.listen(config.port, () => console.log(`App started on port ${config.port}`));
+    app.listen(config, () => console.log(`App started on port ${config.port}`));
 }
 exports.createApp = createApp;
 function addCrowdinEndpoints(app, clientConfig) {

package/out/modules/integration/handlers/crowdin-project.js

@@ -15,8 +15,15 @@ function handle() {
         const projectId = req.crowdinContext.jwtPayload.context.project_id;
         req.logInfo(`Loading crowdin project ${projectId}`);
         const project = yield req.crowdinApiClient.projectsGroupsApi.getProject(projectId);
+        let projectEditorLink;
+        if (req.crowdinContext.jwtPayload.domain) {
+            projectEditorLink = `https://${req.crowdinContext.jwtPayload.domain}.crowdin.com/editor/${project.data.id}`;
+        }
+        else {
+            projectEditorLink = `https://crowdin.com/editor/${project.data.identifier}`;
+        }
         req.logInfo(`Loaded crowdin project ${projectId}`);
-        res.send(project.data);
+        res.send(Object.assign(Object.assign({}, project.data), { projectEditorLink }));
     }));
 }
 exports.default = handle;

package/out/modules/integration/handlers/user-errors.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const storage_1 = require("../../../storage");
 const util_1 = require("../../../util");
+const logger_1 = require("../../../util/logger");
 function handle() {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -20,6 +21,12 @@ function handle() {
         }
         req.logInfo(`Loading user errors for crowdinId ${req.crowdinContext.crowdinId} and integrationId ${req.crowdinContext.clientId}`);
         const userErrors = (_a = (yield (0, storage_1.getStorage)().getAllUserErrors(req.crowdinContext.crowdinId, req.crowdinContext.clientId))) === null || _a === void 0 ? void 0 : _a.map((userError) => {
+            if (!(0, util_1.isJson)(userError.data)) {
+                (0, logger_1.logError)(userError);
+                userError.data = JSON.stringify({
+                    appData: { Warning: 'Invalid response data. Please contact the Crowdin support manager.' },
+                });
+            }
             const date = new Date(+userError.createdAt);
             // Format the date as 'MMM DD, YYYY HH:mm'
             const formattedDate = new Intl.DateTimeFormat('en-US', {
@@ -31,7 +38,7 @@ function handle() {
                 hour12: false,
                 timeZone: userTimezone,
             }).format(date);
-            return Object.assign(Object.assign({}, userError), { createdAt: formattedDate });
+            return Object.assign(Object.assign({}, userError), { formattedDate });
         });
         req.logInfo(`Returning ${userErrors === null || userErrors === void 0 ? void 0 : userErrors.length} user errors`);
         res.send(userErrors);

package/out/modules/integration/index.js

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -56,6 +65,7 @@ const sync_settings_1 = __importDefault(require("./handlers/sync-settings"));
 const sync_settings_save_1 = __importDefault(require("./handlers/sync-settings-save"));
 const user_errors_1 = __importDefault(require("./handlers/user-errors"));
 const cron_1 = require("./util/cron");
+const storage_1 = require("../../storage");
 function register({ config, app }) {
     var _a, _b, _c;
     const integrationLogic = config.projectIntegration;
@@ -96,8 +106,12 @@ function register({ config, app }) {
         cron.schedule('0 */3 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '3' }).catch(console.error));
         cron.schedule('0 */6 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '6' }).catch(console.error));
         cron.schedule('0 */12 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '12' }).catch(console.error));
-        cron.schedule('0 0 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '24' }).catch(console.error));
     }
+    // remove user errors
+    cron.schedule('0 0 * * *', () => __awaiter(this, void 0, void 0, function* () {
+        const date = (0, util_1.getPreviousDate)(integrationLogic.userErrorLifetimeDays);
+        yield (0, storage_1.getStorage)().deleteAllUsersErrorsOlderThan(`${date.getTime()}`);
+    }));
     if (integrationLogic.webhooks) {
         app.post(`${integrationLogic.webhooks.crowdinWebhookUrl
             ? integrationLogic.webhooks.crowdinWebhookUrl

package/out/modules/integration/types.d.ts

@@ -142,6 +142,10 @@ export interface IntegrationLogic {
     asyncProgress?: {
         checkInterval?: number;
     };
+    /**
+     * The duration for storing user errors, default is 30 days.
+     */
+    userErrorLifetimeDays: number;
 }
 export interface LoginForm {
     fields: FormEntity[];

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

@@ -1,11 +1,28 @@
-import Crowdin from '@crowdin/crowdin-api-client';
-import { Config } from '../../../types';
+import Crowdin, { SourceFilesModel } from '@crowdin/crowdin-api-client';
+import { Config, CrowdinContextInfo } from '../../../types';
 import { CronJob, IntegrationLogic, IntegrationRequest, Provider, UpdateIntegrationRequest } from '../types';
+import { JobClientType, JobType } from './types';
 export declare function runJob({ config, integration, job, }: {
     config: Config;
     integration: IntegrationLogic;
     job: CronJob;
 }): Promise<void>;
+export declare function runUpdateProviderJob({ integrationId, crowdinId, type, title, payload, jobType, projectId, client, integration, context, credentials, rootFolder, appSettings, reRunJobId, }: {
+    integrationId: string;
+    crowdinId: string;
+    type: JobType;
+    title?: string;
+    payload?: any;
+    jobType: JobClientType;
+    projectId: number;
+    client: Crowdin;
+    integration: IntegrationLogic;
+    context: CrowdinContextInfo;
+    credentials: any;
+    rootFolder?: SourceFilesModel.Directory;
+    appSettings?: any;
+    reRunJobId?: string;
+}): Promise<void>;
 export declare function filesCron({ config, integration, period, }: {
     config: Config;
     integration: IntegrationLogic;

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

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeFinishedJobs = exports.createOrUpdateSyncSettings = exports.skipFoldersFromIntegrationRequest = exports.filesCron = exports.runJob = void 0;
+exports.removeFinishedJobs = exports.createOrUpdateSyncSettings = exports.skipFoldersFromIntegrationRequest = exports.filesCron = exports.runUpdateProviderJob = exports.runJob = void 0;
 const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
 const storage_1 = require("../../../storage");
 const connection_1 = require("../../../util/connection");
@@ -80,6 +80,52 @@ function runJob({ config, integration, job, }) {
     });
 }
 exports.runJob = runJob;
+function runUpdateProviderJob({ integrationId, crowdinId, type, title, payload, jobType, projectId, client, integration, context, credentials, rootFolder, appSettings, reRunJobId, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield (0, job_1.runAsJob)({
+                integrationId,
+                crowdinId,
+                type,
+                title,
+                payload,
+                jobType,
+                projectId,
+                client,
+                reRunJobId,
+                jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
+                    const updateParams = {
+                        projectId,
+                        client,
+                        credentials,
+                        request: payload,
+                        rootFolder,
+                        appSettings,
+                        job,
+                    };
+                    if (type === types_2.JobType.UPDATE_TO_CROWDIN) {
+                        yield integration.updateCrowdin(updateParams);
+                    }
+                    else if (type === types_2.JobType.UPDATE_TO_INTEGRATION) {
+                        yield integration.updateIntegration(updateParams);
+                    }
+                }),
+            });
+        }
+        catch (e) {
+            const action = type === types_2.JobType.UPDATE_TO_CROWDIN ? 'Auto sync files to Crowdin' : 'Auto sync files to External Service';
+            yield (0, logger_1.handleUserError)({
+                action,
+                error: e,
+                crowdinId: crowdinId,
+                clientId: integrationId,
+            });
+            (0, logger_1.logError)(e, context);
+            throw e;
+        }
+    });
+}
+exports.runUpdateProviderJob = runUpdateProviderJob;
 function filesCron({ config, integration, period, }) {
     return __awaiter(this, void 0, void 0, function* () {
         (0, logger_1.log)(`Starting files cron job with period [${period}]`);
@@ -237,7 +283,7 @@ function processSyncSettings({ config, integration, period, syncSettings, }) {
                 removeInContextLanguage(filesToProcess, projectData);
             }
             try {
-                yield (0, job_1.runAsJob)({
+                yield runUpdateProviderJob({
                     integrationId: syncSettings.integrationId,
                     crowdinId: syncSettings.crowdinId,
                     type: types_2.JobType.UPDATE_TO_INTEGRATION,
@@ -246,27 +292,14 @@ function processSyncSettings({ config, integration, period, syncSettings, }) {
                     jobType: types_2.JobClientType.CRON,
                     projectId: projectId,
                     client: crowdinClient,
-                    jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
-                        yield integration.updateIntegration({
-                            projectId,
-                            client: crowdinClient,
-                            credentials: apiCredentials,
-                            request: filesToProcess,
-                            rootFolder,
-                            appSettings: intConfig,
-                            job,
-                        });
-                    }),
+                    integration,
+                    context,
+                    credentials: apiCredentials,
+                    rootFolder,
+                    appSettings: intConfig,
                 });
             }
             catch (e) {
-                yield (0, logger_1.handleUserError)({
-                    action: 'Auto sync files to External Service',
-                    error: e,
-                    crowdinId: syncSettings.crowdinId,
-                    clientId: syncSettings.integrationId,
-                });
-                (0, logger_1.logError)(e, context);
                 return;
             }
             if (Object.keys(newFiles).length) {
@@ -289,7 +322,7 @@ function processSyncSettings({ config, integration, period, syncSettings, }) {
             (0, logger_1.log)(`Executing updateCrowdin task for files cron job with period [${period}] for project ${projectId}. Files ${intFiles.length}`);
             const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
             try {
-                yield (0, job_1.runAsJob)({
+                yield runUpdateProviderJob({
                     integrationId: syncSettings.integrationId,
                     crowdinId: syncSettings.crowdinId,
                     type: types_2.JobType.UPDATE_TO_CROWDIN,
@@ -298,27 +331,14 @@ function processSyncSettings({ config, integration, period, syncSettings, }) {
                     jobType: types_2.JobClientType.CRON,
                     projectId: projectId,
                     client: crowdinClient,
-                    jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
-                        yield integration.updateCrowdin({
-                            projectId,
-                            client: crowdinClient,
-                            credentials: apiCredentials,
-                            request: intFiles,
-                            rootFolder,
-                            appSettings: intConfig,
-                            job,
-                        });
-                    }),
+                    integration,
+                    context,
+                    credentials: apiCredentials,
+                    rootFolder,
+                    appSettings: intConfig,
                 });
             }
             catch (e) {
-                yield (0, logger_1.handleUserError)({
-                    action: 'Auto sync files to Crowdin',
-                    error: e,
-                    crowdinId: syncSettings.crowdinId,
-                    clientId: syncSettings.integrationId,
-                });
-                (0, logger_1.logError)(e, context);
                 return;
             }
             if (Object.keys(newFiles).length) {

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

@@ -255,6 +255,9 @@ function applyIntegrationModuleDefaults(config, integration) {
     if (!((_b = integration.filtering) === null || _b === void 0 ? void 0 : _b.hasOwnProperty('crowdinLanguages'))) {
         integration.filtering = Object.assign(Object.assign({}, (integration.filtering || {})), { crowdinLanguages: true });
     }
+    if (!integration.userErrorLifetimeDays) {
+        integration.userErrorLifetimeDays = 30;
+    }
 }
 exports.applyIntegrationModuleDefaults = applyIntegrationModuleDefaults;
 function constructOauthUrl({ config, integration, clientId, loginForm, }) {

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

@@ -1,7 +1,8 @@
 import { JobClient, JobClientType, JobType } from './types';
 import { Response } from 'express';
 import Crowdin from '@crowdin/crowdin-api-client';
-export declare function runAsJob({ integrationId, crowdinId, type, title, payload, res, projectId, client, jobType, jobCallback, onError, }: {
+import { Config } from '../../../types';
+export declare function runAsJob({ integrationId, crowdinId, type, title, payload, res, projectId, client, jobType, jobCallback, onError, reRunJobId, }: {
     integrationId: string;
     crowdinId: string;
     type: JobType;
@@ -13,4 +14,6 @@ export declare function runAsJob({ integrationId, crowdinId, type, title, payloa
     jobType: JobClientType;
     jobCallback: (arg1: JobClient) => Promise<any>;
     onError?: (e: any) => Promise<void>;
+    reRunJobId?: string;
 }): Promise<void>;
+export declare function reRunInProgressJobs(config: Config): Promise<void>;

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

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,37 +32,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runAsJob = void 0;
+exports.reRunInProgressJobs = exports.runAsJob = void 0;
 const types_1 = require("./types");
 const storage_1 = require("../../../storage");
 const logger_1 = require("../../../util/logger");
+const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
+const connection_1 = require("../../../util/connection");
+const defaults_1 = require("./defaults");
+const cron_1 = require("./cron");
 const blockingJobs = {
     [types_1.JobType.UPDATE_TO_CROWDIN]: [types_1.JobType.UPDATE_TO_CROWDIN, types_1.JobType.UPDATE_TO_INTEGRATION],
     [types_1.JobType.UPDATE_TO_INTEGRATION]: [types_1.JobType.UPDATE_TO_CROWDIN, types_1.JobType.UPDATE_TO_INTEGRATION],
     [types_1.JobType.CROWDIN_SYNC_SETTINGS_SAVE]: [types_1.JobType.CROWDIN_SYNC_SETTINGS_SAVE],
     [types_1.JobType.INTEGRATION_SYNC_SETTINGS_SAVE]: [types_1.JobType.INTEGRATION_SYNC_SETTINGS_SAVE],
 };
-function runAsJob({ integrationId, crowdinId, type, title, payload, res, projectId, client, jobType, jobCallback, onError, }) {
+const maxAttempts = 3;
+function runAsJob({ integrationId, crowdinId, type, title, payload, res, projectId, client, jobType, jobCallback, onError, reRunJobId, }) {
     return __awaiter(this, void 0, void 0, function* () {
+        let jobId;
         const storage = (0, storage_1.getStorage)();
-        const activeJobs = yield storage.getActiveJobs({ integrationId, crowdinId });
-        if (activeJobs === null || activeJobs === void 0 ? void 0 : activeJobs.length) {
-            const existingJob = activeJobs.find((job) => blockingJobs[type].includes(job.type));
-            if (existingJob === null || existingJob === void 0 ? void 0 : existingJob.id) {
-                if (res) {
-                    res.status(202).send({ jobId: existingJob.id, message: 'Another sync is running' });
+        if (!reRunJobId) {
+            const activeJobs = yield storage.getActiveJobs({ integrationId, crowdinId });
+            if (activeJobs === null || activeJobs === void 0 ? void 0 : activeJobs.length) {
+                const existingJob = activeJobs.find((job) => blockingJobs[type].includes(job.type));
+                if (existingJob === null || existingJob === void 0 ? void 0 : existingJob.id) {
+                    if (res) {
+                        res.status(202).send({ jobId: existingJob.id, message: 'Another sync is running' });
+                    }
+                    (0, logger_1.log)(`Unable to run new job '${type}', with title '${title}', already running jobId ${existingJob.id}.`);
+                    return;
                 }
-                (0, logger_1.log)(`Unable to run new job '${type}', with title '${title}', already running jobId ${existingJob.id}.`);
-                return;
             }
+            jobId = yield storage.createJob({
+                integrationId,
+                crowdinId,
+                type,
+                title: title || '',
+                payload: JSON.stringify(payload),
+            });
+        }
+        else {
+            jobId = reRunJobId;
         }
-        const jobId = yield storage.createJob({
-            integrationId,
-            crowdinId,
-            type,
-            title: title || '',
-            payload: JSON.stringify(payload),
-        });
         if (res) {
             res.status(202).send({ jobId });
         }
@@ -49,7 +83,7 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, project
                     return yield storage.getJob({ id: jobId });
                 });
             },
-            update: function updateProgress({ progress, status, info, data }) {
+            update: function updateProgress({ progress, status, info, data, attempt }) {
                 return __awaiter(this, void 0, void 0, function* () {
                     const prevData = yield this.get();
                     if ((prevData === null || prevData === void 0 ? void 0 : prevData.status) === types_1.JobStatus.CANCELED) {
@@ -61,13 +95,14 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, project
                         status: status || types_1.JobStatus.IN_PROGRESS,
                         info,
                         data: JSON.stringify(data),
+                        attempt,
                     });
                     return { isCanceled: false };
                 });
             },
             type: jobType,
             fetchTranslation: ({ fileId, languageId }) => __awaiter(this, void 0, void 0, function* () {
-                const translationCache = yield storage.getTranslationCache({
+                const translationCache = yield storage.getFileTranslationCacheByLanguage({
                     integrationId,
                     crowdinId,
                     fileId,
@@ -89,20 +124,28 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, project
                 }
                 return translation;
             }),
-            translationUploaded: ({ fileId, languageId, etag }) => __awaiter(this, void 0, void 0, function* () {
-                const translationCache = yield storage.getTranslationCache({
+            // translationUploaded: async ({ fileId, languageId, etag }) => {
+            translationUploaded: ({ fileId, translationParams }) => __awaiter(this, void 0, void 0, function* () {
+                const translationCache = (yield storage.getFileTranslationCache({
                     integrationId,
                     crowdinId,
                     fileId,
-                    languageId,
-                });
-                (0, logger_1.log)(`Saving etag translation for file ${fileId} in language ${languageId}`);
-                if (!translationCache) {
-                    yield storage.saveTranslationCache({ integrationId, crowdinId, fileId, languageId, etag });
-                }
-                else {
-                    yield storage.updateTranslationCache({ integrationId, crowdinId, fileId, languageId, etag });
+                })) || [];
+                const cacheMap = new Map(translationCache.map((cache) => [cache.languageId, cache]));
+                const updates = [];
+                const inserts = [];
+                for (const { languageId, etag } of translationParams) {
+                    const cache = cacheMap.get(languageId);
+                    if (cache) {
+                        (0, logger_1.log)(`Updating etag translation for file ${fileId} in language ${languageId}`);
+                        updates.push(storage.updateTranslationCache({ integrationId, crowdinId, fileId, languageId, etag }));
+                    }
+                    else {
+                        (0, logger_1.log)(`Saving new etag translation for file ${fileId} in language ${languageId}`);
+                        inserts.push(storage.saveTranslationCache({ integrationId, crowdinId, fileId, languageId, etag }));
+                    }
                 }
+                yield Promise.all([...updates, ...inserts]);
             }),
         };
         try {
@@ -128,3 +171,86 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, project
     });
 }
 exports.runAsJob = runAsJob;
+function reRunInProgressJobs(config) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const storage = (0, storage_1.getStorage)();
+        const inProgressJobs = yield storage.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 && activeJob.status !== types_1.JobStatus.IN_PROGRESS) {
+                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 = crowdinAppFunctions.getProjectId(integrationCredentials.id);
+            const context = {
+                jwtPayload: {
+                    context: {
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        project_id: projectId,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        organization_id: crowdinCredentials.organizationId,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        organization_domain: crowdinCredentials.domain,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        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 apiCredentials = 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: apiCredentials,
+                    rootFolder,
+                    appSettings: 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 });
+            }
+        })));
+    });
+}
+exports.reRunInProgressJobs = reRunInProgressJobs;

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

@@ -18,7 +18,8 @@ export declare enum JobStatus {
 }
 export declare enum JobClientType {
     CRON = "cron",
-    MANUAL = "manual"
+    MANUAL = "manual",
+    RERUN = "rerun"
 }
 export interface Job {
     id: string;
@@ -35,6 +36,7 @@ export interface Job {
     finishedAt?: number;
     eta?: number;
     info?: string;
+    attempt?: number;
 }
 export type GetJobParams = Pick<Job, 'id'>;
 export type GetActiveJobsParams = Pick<Job, 'integrationId' | 'crowdinId'>;
@@ -45,6 +47,7 @@ export type UpdateJobParams = {
     status?: JobStatus;
     info?: string;
     data?: string;
+    attempt?: number;
 };
 export type JobClient = {
     get: () => Promise<Job | undefined>;
@@ -53,7 +56,7 @@ export type JobClient = {
     translationUploaded: SaveUploadedFileTranslation;
     fetchTranslation: FetchTranslation;
 };
-export type UpdateJobProgress = ({ progress, status, info, data, }: Omit<UpdateJobParams, 'id'>) => Promise<{
+export type UpdateJobProgress = ({ progress, status, info, data, attempt, }: Omit<UpdateJobParams, 'id'>) => Promise<{
     isCanceled: boolean;
 }>;
 export interface GetAllNewFilesArgs {
@@ -67,10 +70,12 @@ export interface GetAllNewFilesArgs {
     integrationSettings: any;
     syncSettings: IntegrationSyncSettings;
 }
-export type SaveUploadedFileTranslation = ({ fileId, languageId, etag, }: {
+export type SaveUploadedFileTranslation = ({ fileId, translationParams, }: {
     fileId: number;
-    languageId: string;
-    etag: string;
+    translationParams: {
+        languageId: string;
+        etag: string;
+    }[];
 }) => Promise<void>;
 export type FetchTranslation = ({ fileId, languageId, }: {
     fileId: number;
@@ -83,5 +88,6 @@ export interface TranslationCache {
     languageId: string;
     etag?: string;
 }
-export type GetTranslationCacheParams = Pick<TranslationCache, 'integrationId' | 'crowdinId' | 'fileId' | 'languageId'>;
+export type GetFileTranslationCache = Pick<TranslationCache, 'integrationId' | 'crowdinId' | 'fileId'>;
+export type GetFileTranslationCacheByLanguageParams = Pick<TranslationCache, 'integrationId' | 'crowdinId' | 'fileId' | 'languageId'>;
 export type UpdateTranslationCacheParams = Pick<TranslationCache, 'integrationId' | 'crowdinId' | 'fileId' | 'languageId' | 'etag'>;

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

@@ -20,4 +20,5 @@ var JobClientType;
 (function (JobClientType) {
     JobClientType["CRON"] = "cron";
     JobClientType["MANUAL"] = "manual";
+    JobClientType["RERUN"] = "rerun";
 })(JobClientType = exports.JobClientType || (exports.JobClientType = {}));