@crowdin/app-project-module 0.39.1 → 0.41.0

package/out/storage/sqlite.js

@@ -15,6 +15,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLiteStorage = void 0;
 const path_1 = require("path");
+const uuid_1 = require("uuid");
+const job_1 = require("../models/job");
 class SQLiteStorage {
     constructor(config) {
         this.dbPromise = new Promise((res, rej) => {
@@ -92,25 +94,45 @@ class SQLiteStorage {
             });
         });
     }
-    updateTable(newColumns, tableName) {
+    removeColumns(column, tableName) {
+        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} DROP COLUMN ${column};`, []);
+            }
+        });
+    }
+    addColumns(columns, tableName) {
         return __awaiter(this, void 0, void 0, function* () {
             const tableInfo = yield this.each(`PRAGMA table_info(${tableName});`, []);
             //@ts-ignore
             tableInfo.map((columnInfo) => __awaiter(this, void 0, void 0, function* () {
-                const index = newColumns.indexOf(columnInfo.name);
+                const index = columns.indexOf(columnInfo.name);
                 if (~index) {
-                    newColumns.splice(index, 1);
+                    columns.splice(index, 1);
                 }
             }));
-            for (const column of newColumns) {
+            for (const column of columns) {
                 yield this.run(`ALTER TABLE ${tableName} ADD COLUMN ${column} varchar null;`, []);
             }
         });
     }
-    addColumns() {
+    updateTables() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.updateTable(['app_secret', 'domain', 'user_id', 'organization_id', 'base_url'], 'crowdin_credentials');
-            yield this.updateTable(['crowdin_id'], 'app_metadata');
+            yield this.addColumns(['app_secret', 'domain', 'user_id', 'organization_id', 'base_url'], 'crowdin_credentials');
+            yield this.addColumns(['crowdin_id'], 'app_metadata');
+        });
+    }
+    moveIntegrationSettings() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const integrationCredentials = yield this.each('SELECT * FROM integration_credentials', []);
+            for (const credentials of integrationCredentials) {
+                if (credentials.config) {
+                    yield this.saveIntegrationConfig(credentials.id, credentials.crowdin_id, credentials.config);
+                }
+            }
+            yield this.removeColumns('config', 'integration_credentials');
         });
     }
     migrate() {
@@ -153,7 +175,6 @@ class SQLiteStorage {
             (
                 id          varchar not null primary key,
                 credentials varchar not null,
-                config      varchar     null,
                 crowdin_id  varchar not null
             );
             `, []);
@@ -207,10 +228,38 @@ class SQLiteStorage {
                 crowdin_id     varchar not null,
                 integration_id varchar     null
             );
+            `, []);
+                yield this._run(`
+            create table if not exists integration_settings
+            (
+                id              integer not null primary key autoincrement,
+                integration_id  varchar not null,
+                crowdin_id      varchar not null,
+                config          varchar     null
+            );
+            `, []);
+                yield this._run(`
+            create table if not exists job
+            (
+                id             varchar not null primary key,
+                integration_id varchar not null,
+                crowdin_id     varchar not null,
+                type           varchar not null,
+                title          varchar     null,
+                progress       integer DEFAULT 0,
+                status         varchar DEFAULT '${job_1.JobStatus.CREATED}',
+                payload        varchar     null,
+                info           varchar     null,
+                data           varchar     null,
+                created_at     varchar not null,
+                updated_at     varchar     null,
+                finished_at    varchar     null
+            );
             `, []);
                 this._res && this._res();
                 // TODO: temporary code
-                yield this.addColumns();
+                yield this.updateTables();
+                yield this.moveIntegrationSettings();
             }
             catch (e) {
                 this._rej && this._rej(e);
@@ -264,6 +313,8 @@ class SQLiteStorage {
             yield this.run('DELETE FROM files_snapshot WHERE crowdin_id = ?', [id]);
             yield this.run('DELETE FROM webhooks WHERE crowdin_id = ?', [id]);
             yield this.run('DELETE FROM user_errors WHERE crowdin_id = ?', [id]);
+            yield this.run('DELETE FROM integration_settings WHERE crowdin_id = ?', [id]);
+            yield this.run('DELETE FROM job WHERE crowdin_id = ?', [id]);
         });
     }
     saveIntegrationCredentials(id, credentials, crowdinId) {
@@ -276,19 +327,16 @@ class SQLiteStorage {
     updateIntegrationCredentials(id, credentials) {
         return this.run('UPDATE integration_credentials SET credentials = ? WHERE id = ?', [credentials, id]);
     }
-    updateIntegrationConfig(id, config) {
-        return this.run('UPDATE integration_credentials SET config = ? WHERE id = ?', [config, id]);
-    }
     getIntegrationCredentials(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            const row = yield this.get('SELECT id, credentials, config, crowdin_id as crowdinId FROM integration_credentials WHERE id = ?', [id]);
+            const row = yield this.get('SELECT id, credentials, crowdin_id as crowdinId FROM integration_credentials WHERE id = ?', [id]);
             if (row) {
                 return row;
             }
         });
     }
     getAllIntegrationCredentials(crowdinId) {
-        return this.each('SELECT id, credentials, config, crowdin_id as crowdinId FROM integration_credentials WHERE crowdin_id = ?', [crowdinId]);
+        return this.each('SELECT id, credentials, crowdin_id as crowdinId FROM integration_credentials WHERE crowdin_id = ?', [crowdinId]);
     }
     deleteIntegrationCredentials(id) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -296,6 +344,7 @@ class SQLiteStorage {
             yield this.run('DELETE FROM sync_settings where integration_id = ?', [id]);
             yield this.run('DELETE FROM files_snapshot where integration_id = ?', [id]);
             yield this.run('DELETE FROM webhooks where integration_id = ?', [id]);
+            yield this.run('DELETE FROM job where integration_id = ?', [id]);
         });
     }
     deleteAllIntegrationCredentials(crowdinId) {
@@ -305,6 +354,7 @@ class SQLiteStorage {
             yield this.run('DELETE FROM files_snapshot where crowdin_id = ?', [crowdinId]);
             yield this.run('DELETE FROM webhooks where crowdin_id = ?', [crowdinId]);
             yield this.run('DELETE FROM user_errors where crowdin_id = ?', [crowdinId]);
+            yield this.run('DELETE FROM job where crowdin_id = ?', [crowdinId]);
         });
     }
     saveMetadata(id, metadata, crowdinId) {
@@ -426,5 +476,101 @@ class SQLiteStorage {
             return this.run(`DELETE FROM user_errors WHERE created_at < ? AND crowdin_id = ? AND ${whereIntegrationCondition}`, params);
         });
     }
+    saveIntegrationConfig(integrationId, crowdinId, config) {
+        return this.run('INSERT INTO integration_settings(integration_id, crowdin_id, config) VALUES (?, ?, ?)', [
+            integrationId,
+            crowdinId,
+            config,
+        ]);
+    }
+    getAllIntegrationConfigs(crowdinId) {
+        return this.each('SELECT config, integration_id as integrationId FROM integration_settings WHERE crowdin_id = ?', [crowdinId]);
+    }
+    getIntegrationConfig(integrationId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const row = yield this.get('SELECT config  FROM integration_settings WHERE integration_id = ?', [
+                integrationId,
+            ]);
+            if (row) {
+                return row;
+            }
+        });
+    }
+    updateIntegrationConfig(integrationId, config) {
+        return this.run('UPDATE integration_settings SET config = ? WHERE integration_id = ?', [config, integrationId]);
+    }
+    createJob({ integrationId, crowdinId, type, title, payload }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const id = (0, uuid_1.v4)();
+            yield this.run(`
+                INSERT
+                INTO job(id, integration_id, crowdin_id, type, payload, title, created_at)
+                VALUES (?, ?, ?, ?, ?, ?, ?)
+            `, [id, integrationId, crowdinId, type, payload, title, Date.now().toString()]);
+            return id;
+        });
+    }
+    updateJob({ id, progress, status, info, data }) {
+        const updateFields = ['updated_at = ?'];
+        const updateParams = [Date.now().toString()];
+        if (progress) {
+            updateFields.push('progress = ?');
+            updateParams.push(Math.round(progress));
+            if (progress >= 100) {
+                updateFields.push('finished_at = ?');
+                updateParams.push(Date.now().toString());
+            }
+        }
+        if (status) {
+            updateFields.push('status = ?');
+            updateParams.push(status);
+            if (!updateFields.includes('finished_at = ?') && [job_1.JobStatus.FAILED, job_1.JobStatus.CANCELED].includes(status)) {
+                updateFields.push('finished_at = ?');
+                updateParams.push(Date.now().toString());
+            }
+        }
+        if (data) {
+            updateFields.push('data = ?');
+            updateParams.push(data);
+        }
+        if (info) {
+            updateFields.push('info = ?');
+            updateParams.push(info);
+        }
+        updateParams.push(id);
+        const query = `
+            UPDATE job
+            SET ${updateFields.join(', ')}
+            WHERE id = ?
+        `;
+        return this.run(query, updateParams);
+    }
+    getJob({ id }) {
+        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
+                FROM job
+                WHERE id = ?
+            `, [id]);
+            if (row) {
+                return row;
+            }
+        });
+    }
+    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
+                FROM job
+                WHERE integration_id = ? AND crowdin_id = ? AND finished_at is NULL
+            `, [integrationId, crowdinId]);
+        });
+    }
+    deleteFinishedJobs() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.run('DELETE FROM job WHERE finished_at is not NULL', []);
+        });
+    }
 }
 exports.SQLiteStorage = SQLiteStorage;

package/out/util/cron.d.ts

@@ -4,3 +4,4 @@ export declare function runJob(config: Config, integration: IntegrationLogic, jo
 export declare function filesCron(config: Config, integration: IntegrationLogic, period: string): Promise<void>;
 export declare function skipFoldersFromIntegrationRequest(config: Config, integration: IntegrationLogic, projectId: number, crowdinFiles: UpdateIntegrationRequest, crowdinClient: Crowdin): Promise<UpdateIntegrationRequest>;
 export declare function createOrUpdateSyncSettings(config: Config, req: IntegrationRequest, files: any, provider: Provider, onlyCreate?: boolean): Promise<void>;
+export declare function removeFinishedJobs(): Promise<void>;

package/out/util/cron.js

@@ -32,14 +32,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOrUpdateSyncSettings = exports.skipFoldersFromIntegrationRequest = exports.filesCron = exports.runJob = void 0;
+exports.removeFinishedJobs = exports.createOrUpdateSyncSettings = exports.skipFoldersFromIntegrationRequest = exports.filesCron = exports.runJob = void 0;
 const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
 const models_1 = require("../models");
+const job_1 = require("../models/job");
 const storage_1 = require("../storage");
 const connection_1 = require("./connection");
 const defaults_1 = require("./defaults");
 const file_snapshot_1 = require("./file-snapshot");
 const logger_1 = require("./logger");
+const job_2 = require("./job");
 function runJob(config, integration, job) {
     return __awaiter(this, void 0, void 0, function* () {
         (0, logger_1.log)(`Starting cron job with expression [${job.expression}]`);
@@ -61,11 +63,13 @@ function runJob(config, integration, job) {
                 return;
             }
             const integrationCredentialsList = yield (0, storage_1.getStorage)().getAllIntegrationCredentials(crowdinCredentials.id);
+            const allIntegrationConfigs = yield (0, storage_1.getStorage)().getAllIntegrationConfigs(crowdinCredentials.id);
             for (const integrationCredentials of integrationCredentialsList) {
+                const integrationConfig = allIntegrationConfigs.find(({ integrationId }) => integrationId === integrationCredentials.id);
                 const projectId = crowdinAppFunctions.getProjectId(integrationCredentials.id);
                 const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
                 const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
-                const intConfig = integrationCredentials.config ? JSON.parse(integrationCredentials.config) : undefined;
+                const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config) ? JSON.parse(integrationConfig.config) : undefined;
                 (0, logger_1.log)(`Executing task for cron job with expression [${job.expression}] for project ${projectId}`);
                 yield job.task(projectId, crowdinClient, apiCredentials, rootFolder, intConfig);
                 (0, logger_1.log)(`Task for cron job with expression [${job.expression}] for project ${projectId} completed`);
@@ -85,11 +89,12 @@ function filesCron(config, integration, period) {
             let newFiles = [];
             const crowdinCredentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(syncSettings.crowdinId);
             const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(syncSettings.integrationId);
+            const integrationConfig = yield (0, storage_1.getStorage)().getIntegrationConfig(syncSettings.integrationId);
             if (!crowdinCredentials || !integrationCredentials) {
                 return;
             }
-            const intConfig = integrationCredentials.config
-                ? JSON.parse(integrationCredentials.config)
+            const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config)
+                ? JSON.parse(integrationConfig.config)
                 : { schedule: '0', condition: '0' };
             if (period !== intConfig.schedule) {
                 return;
@@ -175,7 +180,24 @@ function filesCron(config, integration, period) {
                 }
                 const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
                 try {
-                    yield integration.updateIntegration(projectId, crowdinClient, apiCredentials, filesToProcess, rootFolder, intConfig);
+                    yield (0, job_2.runAsJob)({
+                        integrationId: syncSettings.integrationId,
+                        crowdinId: syncSettings.crowdinId,
+                        type: job_1.JobType.UPDATE_TO_INTEGRATION,
+                        title: `Sync files to ${config.name} [scheduled]`,
+                        payload: filesToProcess,
+                        jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
+                            yield integration.updateIntegration({
+                                projectId,
+                                client: crowdinClient,
+                                credentials: apiCredentials,
+                                request: filesToProcess,
+                                rootFolder,
+                                appSettings: intConfig,
+                                job,
+                            });
+                        }),
+                    });
                 }
                 catch (e) {
                     (0, logger_1.logError)(e, context);
@@ -198,7 +220,24 @@ function filesCron(config, integration, period) {
                 (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 integration.updateCrowdin(projectId, crowdinClient, apiCredentials, intFiles, rootFolder, intConfig);
+                    yield (0, job_2.runAsJob)({
+                        integrationId: syncSettings.integrationId,
+                        crowdinId: syncSettings.crowdinId,
+                        type: job_1.JobType.UPDATE_TO_CROWDIN,
+                        title: 'Sync files to Crowdin [scheduled]',
+                        payload: intFiles,
+                        jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
+                            yield integration.updateCrowdin({
+                                projectId,
+                                client: crowdinClient,
+                                credentials: apiCredentials,
+                                request: intFiles,
+                                rootFolder,
+                                appSettings: intConfig,
+                                job,
+                            });
+                        }),
+                    });
                 }
                 catch (e) {
                     (0, logger_1.logError)(e, context);
@@ -311,3 +350,11 @@ function createOrUpdateSyncSettings(config, req, files, provider, onlyCreate = f
     });
 }
 exports.createOrUpdateSyncSettings = createOrUpdateSyncSettings;
+function removeFinishedJobs() {
+    return __awaiter(this, void 0, void 0, function* () {
+        (0, logger_1.log)('Removing all finished jobs');
+        yield (0, storage_1.getStorage)().deleteFinishedJobs();
+        (0, logger_1.log)('Removed all finished jobs');
+    });
+}
+exports.removeFinishedJobs = removeFinishedJobs;

package/out/util/defaults.js

@@ -149,17 +149,11 @@ function applyIntegrationModuleDefaults(config, integration) {
             if (getUserSettings) {
                 fields = yield getUserSettings(projectId, crowdinClient, integrationCredentials);
             }
-            const defaultSettings = [
-                {
-                    label: 'Background synchronization',
-                },
-            ];
+            const defaultSettings = [];
             defaultSettings.push({
                 key: 'schedule',
-                label: 'Sync schedule',
-                helpText: integration.webhooks
-                    ? 'Set the frequency for pushing sources and translations. The source file changes made in integration will be synced with Crowdin continuously.'
-                    : 'Set the frequency for pushing sources and translations',
+                label: 'Auto sync',
+                helpText: 'Adjust the update frequency for sources and translations. If enabled, make sure Auto Sync is enabled for your selected directories and files in the dual pane view.',
                 type: 'select',
                 defaultValue: '0',
                 options: [
@@ -282,11 +276,10 @@ function convertClientConfig(clientConfig) {
     const clientSecret = clientConfig.clientSecret || process.env.CROWDIN_CLIENT_SECRET;
     const port = clientConfig.port || process.env.PORT || 3000;
     const { region = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION, tmpBucketName = process.env.AWS_TMP_BUCKET_NAME, } = clientConfig.awsConfig || {};
-    const sentryDsn = clientConfig.sentryDsn || process.env.SENTRY_DSN;
     if (!baseUrl || !clientId || !clientSecret) {
         throw new Error('One of following parameters are not defined [baseUrl, clientId, clientSecret]');
     }
-    return Object.assign(Object.assign({}, clientConfig), { sentryDsn, baseUrl: baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl, clientId,
+    return Object.assign(Object.assign({}, clientConfig), { baseUrl: baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl, clientId,
         clientSecret, awsConfig: {
             tmpBucketName,
             region,

package/out/util/file-snapshot.js

@@ -14,6 +14,7 @@ const models_1 = require("../models");
 const storage_1 = require("../storage");
 const defaults_1 = require("./defaults");
 const index_1 = require("./index");
+const files_1 = require("./files");
 function getFileDiff(currentFiles, savedFiles) {
     return currentFiles.filter((x) => !savedFiles.some((x2) => x2.id === x.id));
 }
@@ -117,6 +118,7 @@ function getIntegrationSnapshot(integration, integrationCredentials, integration
         if (integration.integrationOneLevelFetching) {
             files = yield getOneLevelFetchingFiles(integration, integrationCredentials, integrationSettings, files);
         }
+        files = (0, files_1.skipFilesByRegex)(files, integration.skipIntegrationNodes);
         // trick for compatibility in requests and set files
         files = files.map((file) => (Object.assign(Object.assign({}, file), { parentId: file.parent_id || file.parentId, 
             // eslint-disable-next-line @typescript-eslint/camelcase

package/out/util/files.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
-import { ProcessFileString } from '../models';
+import { ProcessFileString, SkipIntegrationNodes, TreeItem } from '../models';
 export declare const MAX_BODY_SIZE: number;
 export declare function storeFile(fileContent: Buffer, folder: string): Promise<string>;
 export declare function getFileContent(url: string): Promise<Buffer>;
 export declare function getFileStrings(url: string): Promise<ProcessFileString[]>;
+export declare function skipFilesByRegex(files: TreeItem[] | undefined, skipIntegrationNodes?: SkipIntegrationNodes): TreeItem[];

package/out/util/files.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFileStrings = exports.getFileContent = exports.storeFile = exports.MAX_BODY_SIZE = void 0;
+exports.skipFilesByRegex = exports.getFileStrings = exports.getFileContent = exports.storeFile = exports.MAX_BODY_SIZE = void 0;
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -45,3 +45,21 @@ function getFileStrings(url) {
     });
 }
 exports.getFileStrings = getFileStrings;
+function skipFilesByRegex(files, skipIntegrationNodes) {
+    if (!Array.isArray(files)) {
+        return [];
+    }
+    if (skipIntegrationNodes) {
+        files = files.filter((file) => file);
+        if (skipIntegrationNodes.fileNamePattern) {
+            const regex = new RegExp(skipIntegrationNodes.fileNamePattern);
+            files = files.filter((file) => !('type' in file) || !regex.test(file.name));
+        }
+        if (skipIntegrationNodes.folderNamePattern) {
+            const regex = new RegExp(skipIntegrationNodes.folderNamePattern);
+            files = files.filter((file) => 'type' in file || !regex.test(file.name));
+        }
+    }
+    return files;
+}
+exports.skipFilesByRegex = skipFilesByRegex;

package/out/util/index.js

@@ -56,7 +56,9 @@ function handleError(err, req, res) {
             res.redirect('/');
             return;
         }
-        res.status(code).send({ message: (0, logger_1.getErrorMessage)(err), code });
+        if (!res.headersSent) {
+            res.status(code).send({ message: (0, logger_1.getErrorMessage)(err), code });
+        }
     });
 }
 function runAsyncWrapper(callback) {

package/out/util/job.d.ts

@@ -0,0 +1,12 @@
+import { JobClient, JobType } from '../models/job';
+import { Response } from 'express';
+export declare function runAsJob({ integrationId, crowdinId, type, title, payload, res, jobCallback, onError, }: {
+    integrationId: string;
+    crowdinId: string;
+    type: JobType;
+    title?: string;
+    payload?: any;
+    res?: Response;
+    jobCallback: (arg1: JobClient) => Promise<any>;
+    onError?: (e: any) => Promise<void>;
+}): Promise<void>;

package/out/util/job.js

@@ -0,0 +1,88 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAsJob = void 0;
+const job_1 = require("../models/job");
+const storage_1 = require("../storage");
+const logger_1 = require("./logger");
+const blockingJobs = {
+    [job_1.JobType.UPDATE_TO_CROWDIN]: [job_1.JobType.UPDATE_TO_CROWDIN, job_1.JobType.UPDATE_TO_INTEGRATION],
+    [job_1.JobType.UPDATE_TO_INTEGRATION]: [job_1.JobType.UPDATE_TO_CROWDIN, job_1.JobType.UPDATE_TO_INTEGRATION],
+};
+function runAsJob({ integrationId, crowdinId, type, title, payload, res, jobCallback, onError, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        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: 'Job is already running' });
+                }
+                return;
+            }
+        }
+        const jobId = yield storage.createJob({
+            integrationId,
+            crowdinId,
+            type,
+            title: title || '',
+            payload: JSON.stringify(payload),
+        });
+        if (res) {
+            res.status(202).send({ jobId });
+        }
+        const job = {
+            get: function getJob() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return yield storage.getJob({ id: jobId });
+                });
+            },
+            update: function updateProgress({ progress, status, info, data }) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    const prevData = yield this.get();
+                    if ((prevData === null || prevData === void 0 ? void 0 : prevData.status) === job_1.JobStatus.CANCELED) {
+                        return { isCanceled: true };
+                    }
+                    yield storage.updateJob({
+                        id: jobId,
+                        progress,
+                        status: status || job_1.JobStatus.IN_PROGRESS,
+                        info,
+                        data: JSON.stringify(data),
+                    });
+                    return { isCanceled: false };
+                });
+            },
+        };
+        try {
+            const data = yield jobCallback(job);
+            yield job.update({
+                progress: 100,
+                status: job_1.JobStatus.FINISHED,
+                data,
+            });
+        }
+        catch (e) {
+            yield job.update({
+                status: job_1.JobStatus.FAILED,
+                info: (0, logger_1.getErrorMessage)(e),
+            });
+            if (onError) {
+                yield onError(e);
+            }
+            else {
+                throw e;
+            }
+        }
+    });
+}
+exports.runAsJob = runAsJob;

package/out/util/logger.js

@@ -67,7 +67,9 @@ function log(message, context) {
         else {
             let prefix = `[${new Date().toISOString()}]`;
             if (context) {
+                logsFormatter.resetContext();
                 logsFormatter.setContext({
+                    appIdentifier: context.appIdentifier || '',
                     project: {
                         id: context.jwtPayload.context.project_id,
                         identifier: (_a = context.jwtPayload.context.project_identifier) !== null && _a !== void 0 ? _a : '',
@@ -100,7 +102,9 @@ function logError(e, context) {
     }
     else {
         if (context) {
+            logsFormatter.resetContext();
             logsFormatter.setContext({
+                appIdentifier: context.appIdentifier || '',
                 project: {
                     id: context.jwtPayload.context.project_id,
                     identifier: (_a = context.jwtPayload.context.project_identifier) !== null && _a !== void 0 ? _a : '',