@crowdin/app-project-module 0.64.0 → 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', {

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,6 +95,7 @@ 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 };
                 });
@@ -136,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 {

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 = {}));

package/out/storage/index.d.ts

@@ -34,6 +34,7 @@ export interface Storage {
     getAllUserErrors(crowdinId: string, integrationId?: string): Promise<UserErrors[] | undefined>;
     saveUserError(action: string, message: string, data: any, createdAt: string, crowdinId: string, integrationId?: string): Promise<void>;
     deleteUserErrors(date: string, crowdinId: string, integrationId?: string): Promise<void>;
+    deleteAllUsersErrorsOlderThan(date: string): Promise<void>;
     saveIntegrationConfig(integrationId: string, crowdinId: string, config: any): Promise<void>;
     getAllIntegrationConfigs(crowdinId: string): Promise<IntegrationConfig[]>;
     getIntegrationConfig(integrationId: string): Promise<IntegrationConfig | undefined>;
@@ -43,6 +44,7 @@ export interface Storage {
     getJob(params: GetJobParams): Promise<Job | undefined>;
     getActiveJobs(params: GetActiveJobsParams): Promise<Job[] | undefined>;
     deleteFinishedJobs(): Promise<void>;
+    getAllInProgressJobs(): Promise<Job[] | undefined>;
     saveTranslationCache(params: TranslationCache): Promise<void>;
     getFileTranslationCache(params: GetFileTranslationCache): Promise<TranslationCache[] | undefined>;
     getFileTranslationCacheByLanguage(params: GetFileTranslationCacheByLanguageParams): Promise<TranslationCache | undefined>;

package/out/storage/mysql.d.ts

@@ -51,15 +51,17 @@ export declare class MySQLStorage implements Storage {
     getAllUserErrors(crowdinId: string, integrationId?: string): Promise<UserErrors[] | undefined>;
     saveUserError(action: string, message: string, data: any, createdAt: string, crowdinId: string, integrationId?: string): Promise<void>;
     deleteUserErrors(createdAt: string, crowdinId: string, integrationId?: string): Promise<void>;
+    deleteAllUsersErrorsOlderThan(createdAt: string): Promise<void>;
     saveIntegrationConfig(integrationId: string, crowdinId: string, config: any): Promise<void>;
     getAllIntegrationConfigs(crowdinId: string): Promise<IntegrationConfig[]>;
     getIntegrationConfig(integrationId: string): Promise<IntegrationConfig | undefined>;
     updateIntegrationConfig(integrationId: string, config: any): Promise<void>;
     createJob({ integrationId, crowdinId, type, title, payload }: CreateJobParams): Promise<string>;
-    updateJob({ id, progress, status, info, data }: UpdateJobParams): Promise<void>;
+    updateJob({ id, progress, status, info, data, attempt }: UpdateJobParams): Promise<void>;
     getJob({ id }: GetJobParams): Promise<Job | undefined>;
     getActiveJobs({ integrationId, crowdinId }: GetActiveJobsParams): Promise<Job[] | undefined>;
     deleteFinishedJobs(): Promise<void>;
+    getAllInProgressJobs(): Promise<Job[] | undefined>;
     saveTranslationCache({ integrationId, crowdinId, fileId, languageId, etag, }: TranslationCache): Promise<void>;
     getFileTranslationCache({ integrationId, crowdinId, fileId, }: GetFileTranslationCache): Promise<TranslationCache[] | undefined>;
     getFileTranslationCacheByLanguage({ integrationId, crowdinId, fileId, languageId, }: GetFileTranslationCacheByLanguageParams): Promise<TranslationCache | undefined>;

package/out/storage/mysql.js

@@ -161,6 +161,7 @@ class MySQLStorage {
                 payload        text,
                 info           text,
                 data           text,
+                attempt        int 0,
                 created_at     varchar(255) not null,
                 updated_at     varchar(255),
                 finished_at    varchar(255)
@@ -471,6 +472,12 @@ class MySQLStorage {
             });
         });
     }
+    deleteAllUsersErrorsOlderThan(createdAt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            yield this.executeQuery((connection) => connection.execute('DELETE FROM user_errors WHERE created_at < ?', [createdAt]));
+        });
+    }
     saveIntegrationConfig(integrationId, crowdinId, config) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
@@ -518,7 +525,7 @@ class MySQLStorage {
             return id;
         });
     }
-    updateJob({ id, progress, status, info, data }) {
+    updateJob({ id, progress, status, info, data, attempt }) {
         return __awaiter(this, void 0, void 0, function* () {
             const updateFields = ['updated_at'];
             const updateParams = [Date.now().toString()];
@@ -546,6 +553,10 @@ class MySQLStorage {
                 updateFields.push('info = ?');
                 updateParams.push(info);
             }
+            if (attempt) {
+                updateFields.push('attempt = ?');
+                updateParams.push(attempt);
+            }
             updateParams.push(id);
             yield this.dbPromise;
             yield this.executeQuery((connection) => connection.execute(`
@@ -561,7 +572,7 @@ class MySQLStorage {
             return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
                 const [rows] = yield connection.execute(`
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
-                    title, info, payload, data, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                    title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE id = ?
                 `, [id]);
@@ -575,7 +586,7 @@ class MySQLStorage {
             return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
                 const [rows] = yield connection.execute(`
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
-                    title, info, payload, data, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                    title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE integration_id = ? AND crowdin_id = ? AND finished_at is NULL
                 `, [integrationId, crowdinId]);
@@ -589,6 +600,20 @@ class MySQLStorage {
             yield this.executeQuery((connection) => connection.execute('DELETE FROM job WHERE finished_at is not NULL', []));
         });
     }
+    getAllInProgressJobs() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
+                const [rows] = yield connection.execute(`
+                SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
+                    title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                FROM job
+                WHERE status = ? AND finished_at is NULL
+                `, [types_1.JobStatus.IN_PROGRESS]);
+                return rows || [];
+            }));
+        });
+    }
     saveTranslationCache({ integrationId, crowdinId, fileId, languageId, etag, }) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;

package/out/storage/postgre.d.ts

@@ -26,6 +26,7 @@ export declare class PostgreStorage implements Storage {
     migrate(): Promise<void>;
     alterTables(client: Client): Promise<void>;
     addColumns(client: Client, newColumns: string[], tableName: string): Promise<void>;
+    addColumn(client: Client, columnName: string, tableName: string, columnType: string): Promise<void>;
     addTables(client: Client): Promise<void>;
     saveCrowdinCredentials(credentials: CrowdinCredentials): Promise<void>;
     updateCrowdinCredentials(credentials: CrowdinCredentials): Promise<void>;
@@ -57,15 +58,17 @@ export declare class PostgreStorage implements Storage {
     getAllUserErrors(crowdinId: string, integrationId?: string): Promise<UserErrors[] | undefined>;
     saveUserError(action: string, message: string, data: any, createdAt: string, crowdinId: string, integrationId?: string): Promise<void>;
     deleteUserErrors(createdAt: string, crowdinId: string, integrationId?: string): Promise<void>;
+    deleteAllUsersErrorsOlderThan(createdAt: string): Promise<void>;
     saveIntegrationConfig(integrationId: string, crowdinId: string, config: any): Promise<void>;
     getAllIntegrationConfigs(crowdinId: string): Promise<IntegrationConfig[]>;
     getIntegrationConfig(integrationId: string): Promise<IntegrationConfig | undefined>;
     updateIntegrationConfig(integrationId: string, config: any): Promise<void>;
     createJob({ integrationId, crowdinId, type, payload, title }: CreateJobParams): Promise<string>;
-    updateJob({ id, progress, status, info, data }: UpdateJobParams): Promise<void>;
+    updateJob({ id, progress, status, info, data, attempt }: UpdateJobParams): Promise<void>;
     getJob({ id }: GetJobParams): Promise<Job | undefined>;
     getActiveJobs({ integrationId, crowdinId }: GetActiveJobsParams): Promise<Job[] | undefined>;
     deleteFinishedJobs(): Promise<void>;
+    getAllInProgressJobs(): Promise<Job[] | undefined>;
     saveTranslationCache({ integrationId, crowdinId, fileId, languageId, etag, }: TranslationCache): Promise<void>;
     getFileTranslationCache({ integrationId, crowdinId, fileId, }: GetFileTranslationCache): Promise<TranslationCache[] | undefined>;
     getFileTranslationCacheByLanguage({ integrationId, crowdinId, fileId, languageId, }: GetFileTranslationCacheByLanguageParams): Promise<TranslationCache | undefined>;

package/out/storage/postgre.js

@@ -63,6 +63,7 @@ class PostgreStorage {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.addColumns(client, ['crowdin_id'], 'app_metadata');
             yield this.addColumns(client, ['agent_id'], 'crowdin_credentials');
+            yield this.addColumn(client, 'attempt', 'job', 'int default 0');
         });
     }
     addColumns(client, newColumns, tableName) {
@@ -79,6 +80,15 @@ class PostgreStorage {
             }
         });
     }
+    addColumn(client, columnName, tableName, columnType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tableInfo = yield client.query('SELECT column_name FROM information_schema.columns WHERE table_name = $1', [tableName]);
+            const exists = tableInfo.rows.some((columnInfo) => columnInfo.column_name === columnName);
+            if (!exists) {
+                yield client.query(`ALTER TABLE ${tableName} ADD COLUMN ${columnName} ${columnType};`);
+            }
+        });
+    }
     addTables(client) {
         return __awaiter(this, void 0, void 0, function* () {
             yield client.query(`
@@ -178,6 +188,7 @@ class PostgreStorage {
                 payload        varchar     null,
                 info           varchar     null,
                 data           varchar     null,
+                attempt        int default 0,
                 created_at     varchar not null,
                 updated_at     varchar     null,
                 finished_at    varchar     null
@@ -489,6 +500,14 @@ class PostgreStorage {
             });
         });
     }
+    deleteAllUsersErrorsOlderThan(createdAt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            yield this.executeQuery((client) => {
+                return client.query('DELETE FROM user_errors WHERE created_at < $1', [createdAt]);
+            });
+        });
+    }
     saveIntegrationConfig(integrationId, crowdinId, config) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
@@ -538,7 +557,7 @@ class PostgreStorage {
             return id;
         });
     }
-    updateJob({ id, progress, status, info, data }) {
+    updateJob({ id, progress, status, info, data, attempt }) {
         return __awaiter(this, void 0, void 0, function* () {
             const updateFields = ['updated_at'];
             const updateParams = [Date.now().toString()];
@@ -566,6 +585,10 @@ class PostgreStorage {
                 updateFields.push('info = $' + updateParams.length.toString());
                 updateParams.push(info);
             }
+            if (attempt) {
+                updateFields.push('attempt = $' + updateParams.length.toString());
+                updateParams.push(attempt);
+            }
             updateParams.push(id);
             yield this.dbPromise;
             yield this.executeQuery((client) => client.query(`
@@ -581,7 +604,7 @@ class PostgreStorage {
             return this.executeQuery((client) => __awaiter(this, void 0, void 0, function* () {
                 const res = yield client.query(`
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
-                    title, info, payload, data, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                    title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE id = $1
                 `, [id]);
@@ -595,7 +618,7 @@ class PostgreStorage {
             return this.executeQuery((client) => __awaiter(this, void 0, void 0, function* () {
                 const res = yield client.query(`
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
-                    title, info, payload, data, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                    title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE integration_id = $1 AND crowdin_id = $2 AND finished_at is NULL
                 `, [integrationId, crowdinId]);
@@ -609,6 +632,20 @@ class PostgreStorage {
             yield this.executeQuery((client) => client.query(' DELETE FROM job WHERE finished_at is not NULL', []));
         });
     }
+    getAllInProgressJobs() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            return this.executeQuery((client) => __awaiter(this, void 0, void 0, function* () {
+                const res = yield client.query(`
+                SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
+                    title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                FROM job
+                WHERE status = $1 AND finished_at is NULL
+                `, [types_1.JobStatus.IN_PROGRESS]);
+                return (res === null || res === void 0 ? void 0 : res.rows) || [];
+            }));
+        });
+    }
     saveTranslationCache({ integrationId, crowdinId, fileId, languageId, etag, }) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;

package/out/storage/sqlite.d.ts

@@ -19,6 +19,7 @@ export declare class SQLiteStorage implements Storage {
     private each;
     private removeColumns;
     private addColumns;
+    private addColumn;
     private updateTables;
     private moveIntegrationSettings;
     migrate(): Promise<void>;
@@ -52,15 +53,17 @@ export declare class SQLiteStorage implements Storage {
     getAllUserErrors(crowdinId: string, integrationId?: string): Promise<UserErrors[]>;
     saveUserError(action: string, message: string, data: any, createdAt: string, crowdinId: string, integrationId?: string): Promise<void>;
     deleteUserErrors(createAt: string, crowdinId: string, integrationId?: string): Promise<void>;
+    deleteAllUsersErrorsOlderThan(createAt: string): Promise<void>;
     saveIntegrationConfig(integrationId: string, crowdinId: string, config: any): Promise<void>;
     getAllIntegrationConfigs(crowdinId: string): Promise<IntegrationConfig[]>;
     getIntegrationConfig(integrationId: string): Promise<IntegrationConfig | undefined>;
     updateIntegrationConfig(integrationId: string, config: any): Promise<void>;
     createJob({ integrationId, crowdinId, type, title, payload }: CreateJobParams): Promise<string>;
-    updateJob({ id, progress, status, info, data }: UpdateJobParams): Promise<void>;
+    updateJob({ id, progress, status, info, data, attempt }: UpdateJobParams): Promise<void>;
     getJob({ id }: GetJobParams): Promise<Job | undefined>;
     getActiveJobs({ integrationId, crowdinId }: GetActiveJobsParams): Promise<Job[] | undefined>;
     deleteFinishedJobs(): Promise<void>;
+    getAllInProgressJobs(): Promise<Job[] | undefined>;
     saveTranslationCache({ integrationId, crowdinId, fileId, languageId, etag }: TranslationCache): Promise<void>;
     getFileTranslationCache({ integrationId, crowdinId, fileId, }: GetFileTranslationCache): Promise<TranslationCache[] | undefined>;
     getFileTranslationCacheByLanguage({ integrationId, crowdinId, fileId, languageId, }: GetFileTranslationCacheByLanguageParams): Promise<TranslationCache | undefined>;

package/out/storage/sqlite.js

@@ -118,10 +118,20 @@ class SQLiteStorage {
             }
         });
     }
+    addColumn(tableName, column, defaultValue) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tableInfo = yield this.each(`PRAGMA table_info(${tableName});`, []);
+            const exists = tableInfo.some((columnInfo) => columnInfo.name === column);
+            if (!exists) {
+                yield this.run(`ALTER TABLE ${tableName} ADD COLUMN ${column} varchar ${defaultValue};`, []);
+            }
+        });
+    }
     updateTables() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.addColumns(['app_secret', 'domain', 'user_id', 'agent_id', 'organization_id', 'base_url'], 'crowdin_credentials');
             yield this.addColumns(['crowdin_id'], 'app_metadata');
+            yield this.addColumn('job', 'attempt', 'DEFAULT 0');
         });
     }
     moveIntegrationSettings() {
@@ -252,6 +262,7 @@ class SQLiteStorage {
                 payload        varchar     null,
                 info           varchar     null,
                 data           varchar     null,
+                attempt        varchar DEFAULT 0,
                 created_at     varchar not null,
                 updated_at     varchar     null,
                 finished_at    varchar     null
@@ -491,6 +502,11 @@ class SQLiteStorage {
             return this.run(`DELETE FROM user_errors WHERE created_at < ? AND crowdin_id = ? AND ${whereIntegrationCondition}`, params);
         });
     }
+    deleteAllUsersErrorsOlderThan(createAt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.run('DELETE FROM user_errors where created_at < ?', [createAt]);
+        });
+    }
     saveIntegrationConfig(integrationId, crowdinId, config) {
         return this.run('INSERT INTO integration_settings(integration_id, crowdin_id, config) VALUES (?, ?, ?)', [
             integrationId,
@@ -525,7 +541,7 @@ class SQLiteStorage {
             return id;
         });
     }
-    updateJob({ id, progress, status, info, data }) {
+    updateJob({ id, progress, status, info, data, attempt }) {
         const updateFields = ['updated_at = ?'];
         const updateParams = [Date.now().toString()];
         if (progress) {
@@ -552,6 +568,10 @@ class SQLiteStorage {
             updateFields.push('info = ?');
             updateParams.push(info);
         }
+        if (attempt) {
+            updateFields.push('attempt = ?');
+            updateParams.push(attempt);
+        }
         updateParams.push(id);
         const query = `
             UPDATE job
@@ -564,7 +584,7 @@ class SQLiteStorage {
         return __awaiter(this, void 0, void 0, function* () {
             const row = yield this.get(`
                 SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status,
-                    title, info, payload, data, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                    title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE id = ?
             `, [id]);
@@ -576,7 +596,7 @@ class SQLiteStorage {
     getActiveJobs({ integrationId, crowdinId }) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.each(`
-                SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status, title, info, payload, data, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status, title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
                 FROM job
                 WHERE integration_id = ? AND crowdin_id = ? AND finished_at is NULL
             `, [integrationId, crowdinId]);
@@ -587,6 +607,15 @@ class SQLiteStorage {
             yield this.run('DELETE FROM job WHERE finished_at is not NULL', []);
         });
     }
+    getAllInProgressJobs() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.each(`
+                SELECT id, integration_id as integrationId, crowdin_id as crowdinId, type, payload, progress, status, title, info, data, attempt, created_at as createdAt, updated_at as updatedAt, finished_at as finishedAt
+                FROM job
+                WHERE status = ? AND finished_at is NULL
+            `, [types_1.JobStatus.IN_PROGRESS]);
+        });
+    }
     saveTranslationCache({ integrationId, crowdinId, fileId, languageId, etag }) {
         return this.run(`
                 INSERT

package/out/util/credentials-masker.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="qs" />
 import { CrowdinClientRequest, UiModule } from '../types';
 import { Request, Response } from 'express';
-declare function postRequestCredentialsMasker(moduleConfig?: UiModule, credentialsExtractor?: Function): (req: CrowdinClientRequest | Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
 declare function getRequestCredentialsMasker(moduleConfig?: UiModule): (req: Request | CrowdinClientRequest, res: Response, next: Function) => any;
+declare function postRequestCredentialsMasker(moduleConfig?: UiModule, credentialsExtractor?: Function): (req: CrowdinClientRequest | Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
 export { getRequestCredentialsMasker, postRequestCredentialsMasker };

package/out/util/credentials-masker.js

@@ -32,8 +32,39 @@ function getMaskableFieldsKeys(moduleConfig) {
         return (0, lodash_get_1.default)(moduleConfig, `formUiSchema[${fieldKey}]['ui:widget']`) === 'password';
     });
 }
+function getRequestCredentialsMasker(moduleConfig) {
+    return function (req, res, next) {
+        // we can't find "password" fields without ui schema
+        if (!moduleConfig || !moduleConfig.formSchema || !moduleConfig.formUiSchema) {
+            return next();
+        }
+        // temporary
+        if (!moduleConfig.maskPasswords) {
+            return next();
+        }
+        const maskableFieldsKeys = getMaskableFieldsKeys(moduleConfig);
+        if (!maskableFieldsKeys.length) {
+            return next();
+        }
+        const originalSend = res.send;
+        res.send = function (body) {
+            if (body.formData) {
+                maskableFieldsKeys.forEach((fieldKey) => {
+                    if (!body.formData[fieldKey]) {
+                        return;
+                    }
+                    body.formData[fieldKey] = maskKey(body.formData[fieldKey]);
+                });
+            }
+            return originalSend.apply(res, [body]);
+        };
+        return next();
+    };
+}
+exports.getRequestCredentialsMasker = getRequestCredentialsMasker;
 function postRequestCredentialsMasker(moduleConfig, credentialsExtractor) {
     return (0, index_1.runAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (!moduleConfig || !moduleConfig.formSchema || !moduleConfig.formUiSchema) {
             return next();
         }
@@ -41,7 +72,7 @@ function postRequestCredentialsMasker(moduleConfig, credentialsExtractor) {
         if (!moduleConfig.maskPasswords) {
             return next();
         }
-        const fieldsKeysInRequest = Object.keys(req.body.data);
+        const fieldsKeysInRequest = Object.keys(((_a = req.body) === null || _a === void 0 ? void 0 : _a.data) || []);
         let unmaskedFields = {};
         if (credentialsExtractor) {
             unmaskedFields = yield credentialsExtractor(req, res);
@@ -66,37 +97,8 @@ function postRequestCredentialsMasker(moduleConfig, credentialsExtractor) {
             }
             return acc;
         }, {}));
-        next();
+        // run getRequestCredentialsMasker to mask fields that can be in response
+        return getRequestCredentialsMasker(moduleConfig)(req, res, next);
     }));
 }
 exports.postRequestCredentialsMasker = postRequestCredentialsMasker;
-function getRequestCredentialsMasker(moduleConfig) {
-    return function (req, res, next) {
-        // we can't find "password" fields without ui schema
-        if (!moduleConfig || !moduleConfig.formSchema || !moduleConfig.formUiSchema) {
-            return next();
-        }
-        // temporary
-        if (!moduleConfig.maskPasswords) {
-            return next();
-        }
-        const maskableFieldsKeys = getMaskableFieldsKeys(moduleConfig);
-        if (!maskableFieldsKeys.length) {
-            return next();
-        }
-        const originalSend = res.send;
-        res.send = function (body) {
-            if (body.formData) {
-                maskableFieldsKeys.forEach((fieldKey) => {
-                    if (!body.formData[fieldKey]) {
-                        return;
-                    }
-                    body.formData[fieldKey] = maskKey(body.formData[fieldKey]);
-                });
-            }
-            return originalSend.apply(res, [body]);
-        };
-        return next();
-    };
-}
-exports.getRequestCredentialsMasker = getRequestCredentialsMasker;

package/out/util/index.d.ts

@@ -10,3 +10,6 @@ export declare function decryptData(config: Config, data: string): string;
 export declare function executeWithRetry<T>(func: () => Promise<T>, numOfRetries?: number): Promise<T>;
 export declare function getLogoUrl(moduleConfig?: ImagePath, modulePath?: string): string;
 export declare function isAuthorizedConfig(config: Config | UnauthorizedConfig): config is Config;
+export declare function hasFormSchema(moduleConfig: any): boolean;
+export declare function isJson(string: string): boolean;
+export declare function getPreviousDate(days: number): Date;

package/out/util/index.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAuthorizedConfig = exports.getLogoUrl = exports.executeWithRetry = exports.decryptData = exports.encryptData = exports.runAsyncWrapper = exports.CodeError = void 0;
+exports.getPreviousDate = exports.isJson = exports.hasFormSchema = exports.isAuthorizedConfig = exports.getLogoUrl = exports.executeWithRetry = exports.decryptData = exports.encryptData = exports.runAsyncWrapper = exports.CodeError = void 0;
 const crypto = __importStar(require("crypto-js"));
 const storage_1 = require("../storage");
 const types_1 = require("../types");
@@ -118,3 +118,27 @@ function isAuthorizedConfig(config) {
     return !!config.clientId && !!config.clientSecret && config.authenticationType !== types_1.AuthenticationType.NONE;
 }
 exports.isAuthorizedConfig = isAuthorizedConfig;
+function hasFormSchema(moduleConfig) {
+    var _a;
+    if (typeof moduleConfig === 'object' && moduleConfig !== null) {
+        return moduleConfig.formSchema || ((_a = moduleConfig.settingsUiModule) === null || _a === void 0 ? void 0 : _a.formSchema);
+    }
+    return false;
+}
+exports.hasFormSchema = hasFormSchema;
+function isJson(string) {
+    try {
+        JSON.parse(string);
+    }
+    catch (e) {
+        return false;
+    }
+    return true;
+}
+exports.isJson = isJson;
+function getPreviousDate(days) {
+    const date = new Date();
+    date.setDate(date.getDate() - days);
+    return date;
+}
+exports.getPreviousDate = getPreviousDate;

package/out/util/logger.js

@@ -224,11 +224,6 @@ function storeUserError({ action, error, crowdinId, clientId, }) {
         yield (0, storage_1.getStorage)().saveUserError(action, (error === null || error === void 0 ? void 0 : error.message) || JSON.stringify(error, null, 2), JSON.stringify(data), `${Date.now()}`, crowdinId, clientId);
     });
 }
-function clearOldUserErrors(crowdinId, clientId) {
-    const date = new Date();
-    date.setMonth(date.getMonth() - 1); // previous month
-    (0, storage_1.getStorage)().deleteUserErrors(`${date.getTime()}`, crowdinId, clientId);
-}
 function mergeAppModuleAggregateErrors(errors) {
     const result = [];
     const mergedData = {};
@@ -269,7 +264,6 @@ function handleUserError({ action, error, crowdinId, clientId, }) {
         }
         else {
             yield storeUserError({ action, error, crowdinId, clientId });
-            clearOldUserErrors(crowdinId, clientId);
         }
     });
 }

package/out/util/terminus-express.js

@@ -5,12 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
 const terminus_1 = require("@godaddy/terminus");
+const job_1 = require("../modules/integration/util/job");
 express_1.default.application.baseListen = express_1.default.application.listen;
 express_1.default.application.listen = function (...args) {
-    const [port, callback] = args;
-    const server = this.baseListen.call(this, port);
+    const [config, callback] = args;
+    const server = this.baseListen.call(this, config.port);
     if (callback) {
         callback();
+        (0, job_1.reRunInProgressJobs)(config);
     }
     (0, terminus_1.createTerminus)(server, {
         timeout: Infinity,

package/out/views/main.handlebars

@@ -418,7 +418,11 @@
             .then(checkResponse)
             .then((res) => {
                 project = res;
-                const languagesSorted = project.targetLanguages.sort((a, b) => a.name.localeCompare(b.name));
+                const languagesSorted = project.targetLanguages.map(language => ({
+                  sourceLanguageId: res.sourceLanguage.editorCode,
+                  projectEditorLink: res.projectEditorLink,
+                  ...language,
+                })).sort((a, b) => a.name.localeCompare(b.name));
 
                 if (project.inContext && config?.inContext) {
                     languagesSorted.push({...project.inContextPseudoLanguage, inContext: true});
@@ -1204,7 +1208,7 @@
       } else {
         html += `<tr><td>Message</td><td>${sanitizeHTML(error.message)}</td></tr>`;
       }
-      html += `<tr><td>Date/time</td><td>${sanitizeHTML(error.createdAt)}</td></tr>`;
+      html += `<tr><td>Date/time</td><td>${sanitizeHTML(error.formattedDate)}</td></tr>`;
 
       if (data.requestParams) {
         html += `<tr><td>Method</td><td>${sanitizeHTML(data.requestParams.method)}</td></tr>`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.64.0",
+  "version": "0.65.0",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",