@crowdin/app-project-module 1.5.4 → 1.5.5

package/out/modules/integration/handlers/job-info-deprecated.js

@@ -37,7 +37,7 @@ function getHumanETA(ms) {
 }
 function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const isApi = req.isApiCall;
         const id = ((_a = req.query) === null || _a === void 0 ? void 0 : _a.jobId) || ((_b = req.body) === null || _b === void 0 ? void 0 : _b.jobId);
         if (!id) {
@@ -85,7 +85,15 @@ function handle(config) {
             res.send([filteredJob]);
             return;
         }
-        if (job && (job === null || job === void 0 ? void 0 : job.updatedAt) && Date.now() - job.updatedAt >= MINUTES * 60 * 1000) {
+        const jobTimestamp = (_c = job === null || job === void 0 ? void 0 : job.updatedAt) !== null && _c !== void 0 ? _c : job === null || job === void 0 ? void 0 : job.createdAt;
+        const isJobStuck = !!job && !!jobTimestamp && Date.now() - jobTimestamp >= MINUTES * 60 * 1000;
+        if (isJobStuck) {
+            const settingsJobTypes = [types_1.JobType.CROWDIN_SYNC_SETTINGS_SAVE, types_1.JobType.INTEGRATION_SYNC_SETTINGS_SAVE];
+            if (settingsJobTypes.includes(job.type)) {
+                req.logInfo(`Canceling stuck settings job '${job.id}' after no updates for more than '${MINUTES}' minutes.`);
+                yield (0, storage_1.getStorage)().updateJob({ id: job.id, status: types_1.JobStatus.CANCELED });
+                return res.send(Object.assign(Object.assign({}, job), { status: types_1.JobStatus.CANCELED }));
+            }
             const context = req.crowdinContext;
             const projectId = context.jwtPayload.context.project_id;
             const integration = config.projectIntegration;

package/out/modules/integration/handlers/sync-settings-save.js

@@ -85,7 +85,7 @@ function handle(config, integration) {
                     ((_a = integration.syncNewElements) === null || _a === void 0 ? void 0 : _a[provider]) &&
                     (settings[`new-${provider}-files`] || hasSyncedFolders);
                 if (needsSnapshot) {
-                    yield (0, snapshot_1.createOrUpdateFileSnapshot)(config, integration, req, provider);
+                    yield (0, snapshot_1.createOrUpdateFileSnapshot)(config, integration, req, provider, job);
                 }
             }),
         });

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

@@ -65,7 +65,7 @@ function expandFilesTree(nodes, req, integration, job) {
         }
         const files = nodes.filter((file) => file.nodeType === undefined || file.nodeType === '1');
         const folders = nodes.filter((folder) => folder.nodeType === '0' && !nodes.find((node) => node.parentId === folder.id));
-        for (const { id } of folders) {
+        for (const { id, name } of folders) {
             let integrationData = [];
             try {
                 integrationData = yield integration.getIntegrationFiles({
@@ -75,6 +75,9 @@ function expandFilesTree(nodes, req, integration, job) {
                     settings: req.integrationSettings,
                     parentId: id,
                 });
+                if (job) {
+                    yield job.update({ info: `Loading files from '${name}'` });
+                }
             }
             catch (e) {
                 if (job) {

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

@@ -1,12 +1,14 @@
 import Crowdin from '@crowdin/crowdin-api-client';
 import { Config } from '../../../types';
 import { IntegrationLogic, IntegrationRequest, Provider, TreeItem } from '../types';
+import { JobClient } from './types';
 export declare function getCrowdinSnapshot(config: Config, integration: IntegrationLogic, crowdinApiClient: Crowdin, projectId: number, integrationSettings: any): Promise<TreeItem[]>;
-export declare function getIntegrationSnapshot({ integration, integrationCredentials, integrationSettings, client, projectId, }: {
+export declare function getIntegrationSnapshot({ integration, integrationCredentials, integrationSettings, client, projectId, job, }: {
     integration: IntegrationLogic;
     integrationCredentials: any;
     integrationSettings: any;
     client?: Crowdin;
     projectId?: number;
+    job?: JobClient;
 }): Promise<TreeItem[]>;
-export declare function createOrUpdateFileSnapshot(config: Config, integration: IntegrationLogic, req: IntegrationRequest, provider: Provider): Promise<void>;
+export declare function createOrUpdateFileSnapshot(config: Config, integration: IntegrationLogic, req: IntegrationRequest, provider: Provider, job?: JobClient): Promise<void>;

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

@@ -16,6 +16,7 @@ const types_1 = require("../types");
 const storage_1 = require("../../../storage");
 const defaults_1 = require("./defaults");
 const files_1 = require("./files");
+const types_2 = require("./types");
 const DEFAULT_SNAPSHOT_FETCH_CONCURRENCY = 1;
 function getCrowdinSnapshot(config, integration, crowdinApiClient, projectId, integrationSettings) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -42,10 +43,10 @@ function getTreeItems(integrationData) {
     }
     return files;
 }
-function getOneLevelFetchingFiles(integration, integrationCredentials, integrationSettings, parentFiles, client, projectId) {
-    return __awaiter(this, void 0, void 0, function* () {
+function getOneLevelFetchingFiles(integration_1, integrationCredentials_1, integrationSettings_1, parentFiles_1, client_1, projectId_1, job_1) {
+    return __awaiter(this, arguments, void 0, function* (integration, integrationCredentials, integrationSettings, parentFiles, client, projectId, job, visitedIds = new Set()) {
         var _a;
-        const folders = parentFiles.filter((file) => !file.type);
+        const folders = parentFiles.filter((file) => !file.type && !visitedIds.has(file.id));
         if (folders.length === 0) {
             return parentFiles;
         }
@@ -54,6 +55,11 @@ function getOneLevelFetchingFiles(integration, integrationCredentials, integrati
         for (let i = 0; i < folders.length; i += concurrency) {
             const batch = folders.slice(i, i + concurrency);
             const batchResults = yield Promise.all(batch.map((folder) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                if (job && types_2.JobStatus.CANCELED === ((_a = (yield job.get())) === null || _a === void 0 ? void 0 : _a.status)) {
+                    throw new Error('Job canceled');
+                }
+                visitedIds.add(folder.id);
                 const childs = getTreeItems(yield integration.getIntegrationFiles({
                     credentials: integrationCredentials,
                     client,
@@ -63,10 +69,13 @@ function getOneLevelFetchingFiles(integration, integrationCredentials, integrati
                     search: '',
                     page: 0,
                 }));
+                if (job) {
+                    yield job.update({ info: `Loading snapshot from ${folder.name}` });
+                }
                 if (childs.length === 0) {
                     return [];
                 }
-                return getOneLevelFetchingFiles(integration, integrationCredentials, integrationSettings, childs, client, projectId);
+                return getOneLevelFetchingFiles(integration, integrationCredentials, integrationSettings, childs, client, projectId, job, visitedIds);
             })));
             results.push(...batchResults.flat());
         }
@@ -74,7 +83,7 @@ function getOneLevelFetchingFiles(integration, integrationCredentials, integrati
     });
 }
 function getIntegrationSnapshot(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ integration, integrationCredentials, integrationSettings, client, projectId, }) {
+    return __awaiter(this, arguments, void 0, function* ({ integration, integrationCredentials, integrationSettings, client, projectId, job, }) {
         var _b;
         let files = [];
         let integrationData = [];
@@ -88,7 +97,7 @@ function getIntegrationSnapshot(_a) {
         });
         files = getTreeItems(integrationData);
         if (integration.integrationOneLevelFetching) {
-            files = yield getOneLevelFetchingFiles(integration, integrationCredentials, integrationSettings, files, client, projectId);
+            files = yield getOneLevelFetchingFiles(integration, integrationCredentials, integrationSettings, files, client, projectId, job);
         }
         if ((integrationSettings === null || integrationSettings === void 0 ? void 0 : integrationSettings.skipIntegrationNodesToggle) === true ||
             ((integrationSettings === null || integrationSettings === void 0 ? void 0 : integrationSettings.skipIntegrationNodesToggle) === null && ((_b = integration.skipIntegrationNodesToggle) === null || _b === void 0 ? void 0 : _b.value))) {
@@ -99,7 +108,7 @@ function getIntegrationSnapshot(_a) {
         return files;
     });
 }
-function createOrUpdateFileSnapshot(config, integration, req, provider) {
+function createOrUpdateFileSnapshot(config, integration, req, provider, job) {
     return __awaiter(this, void 0, void 0, function* () {
         let files = [];
         const existingSnapshot = yield (0, storage_1.getStorage)().getFilesSnapshot(req.crowdinContext.clientId, req.crowdinContext.crowdinId, provider);
@@ -113,6 +122,7 @@ function createOrUpdateFileSnapshot(config, integration, req, provider) {
                 integrationSettings: req.integrationSettings,
                 client: req.crowdinApiClient,
                 projectId: req.crowdinContext.jwtPayload.context.project_id,
+                job,
             });
         }
         if (existingSnapshot) {

package/package.json

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