@crowdin/app-project-module 0.51.4 → 0.52.0

package/out/app-test/integration/update-crowdin.js

@@ -105,6 +105,7 @@ const updateCrowdinTest = ({ appConfig, integrationTestConfig, }) => __awaiter(v
                     });
                 },
                 update: updateProgressMock,
+                type: types_1.JobClientType.MANUAL,
             },
         });
     }, 'Fail to run method updateCrowdin()');

package/out/app-test/integration/update-integration.js

@@ -62,6 +62,7 @@ const updateIntegrationTest = ({ appConfig, integrationTestConfig, }) => __await
                     });
                 },
                 update: updateProgressMock,
+                type: types_1.JobClientType.MANUAL,
             },
         });
     }, 'Fail to run method updateIntegration()');

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

@@ -40,6 +40,7 @@ function handle(config, integration) {
             title: 'Sync files to Crowdin',
             payload: req.body,
             res,
+            jobType: types_1.JobClientType.MANUAL,
             jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
                 var _c;
                 if (req.body && ((_c = req.body) === null || _c === void 0 ? void 0 : _c.length)) {

package/out/modules/integration/handlers/integration-update.js

@@ -34,6 +34,7 @@ function handle(config, integration) {
             title: 'Sync files to ' + config.name,
             payload: req.body,
             res,
+            jobType: types_1.JobClientType.MANUAL,
             jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
                 const result = yield integration.updateIntegration({
                     projectId: req.crowdinContext.jwtPayload.context.project_id,

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

@@ -18,6 +18,7 @@ const cron_1 = require("../util/cron");
 const snapshot_1 = require("../util/snapshot");
 const files_1 = require("../util/files");
 const job_1 = require("../util/job");
+const types_1 = require("../util/types");
 function checkAutoSyncSettings(integration, appSettings, provider) {
     var _a;
     return !!(!integration.webhooks && ((_a = integration.syncNewElements) === null || _a === void 0 ? void 0 : _a[provider]) && appSettings[`new-${provider}-files`]);
@@ -32,6 +33,7 @@ function handle(config, integration) {
             title: 'Save sync settings',
             payload: req.body,
             res,
+            jobType: types_1.JobClientType.MANUAL,
             jobCallback: () => __awaiter(this, void 0, void 0, function* () {
                 if (Array.isArray(expandIntegrationFolders) && expandIntegrationFolders.length) {
                     const allFiles = (yield (0, files_1.expandFilesTree)(expandIntegrationFolders, req, integration)).map((node) => ({

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

@@ -92,13 +92,13 @@ function filesCron({ config, integration, period, }) {
             const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(syncSettings.integrationId);
             const integrationConfig = yield (0, storage_1.getStorage)().getIntegrationConfig(syncSettings.integrationId);
             if (!crowdinCredentials || !integrationCredentials) {
-                return;
+                continue;
             }
             const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config)
                 ? JSON.parse(integrationConfig.config)
                 : { schedule: '0', condition: '0' };
             if (period !== intConfig.schedule) {
-                return;
+                continue;
             }
             const projectId = crowdinAppFunctions.getProjectId(integrationCredentials.id);
             const context = {
@@ -129,7 +129,7 @@ function filesCron({ config, integration, period, }) {
             });
             if (expired) {
                 (0, logger_1.log)(`Subscription expired. Skipping job [${period}] for organization ${crowdinCredentials.id}`);
-                return;
+                continue;
             }
             const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient, projectId);
             const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
@@ -188,7 +188,7 @@ function filesCron({ config, integration, period, }) {
                 if (!all) {
                     if (Object.keys(filesToProcess).length === 0) {
                         (0, logger_1.log)(`There is no ${onlyApproved ? 'approved' : 'translated'} file`);
-                        return;
+                        continue;
                     }
                 }
                 const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
@@ -199,6 +199,7 @@ function filesCron({ config, integration, period, }) {
                         type: types_2.JobType.UPDATE_TO_INTEGRATION,
                         title: `Sync files to ${config.name} [scheduled]`,
                         payload: filesToProcess,
+                        jobType: types_2.JobClientType.CRON,
                         jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
                             yield integration.updateIntegration({
                                 projectId,
@@ -239,6 +240,7 @@ function filesCron({ config, integration, period, }) {
                         type: types_2.JobType.UPDATE_TO_CROWDIN,
                         title: 'Sync files to Crowdin [scheduled]',
                         payload: intFiles,
+                        jobType: types_2.JobClientType.CRON,
                         jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
                             yield integration.updateCrowdin({
                                 projectId,

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

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

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

@@ -19,7 +19,7 @@ const blockingJobs = {
     [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, jobCallback, onError, }) {
+function runAsJob({ integrationId, crowdinId, type, title, payload, res, jobType, jobCallback, onError, }) {
     return __awaiter(this, void 0, void 0, function* () {
         const storage = (0, storage_1.getStorage)();
         const activeJobs = yield storage.getActiveJobs({ integrationId, crowdinId });
@@ -65,6 +65,7 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, jobCall
                     return { isCanceled: false };
                 });
             },
+            type: jobType,
         };
         try {
             const data = yield jobCallback(job);

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

@@ -14,6 +14,10 @@ export declare enum JobStatus {
     FAILED = "failed",
     CANCELED = "canceled"
 }
+export declare enum JobClientType {
+    CRON = "cron",
+    MANUAL = "manual"
+}
 export interface Job {
     id: string;
     integrationId: string;
@@ -43,6 +47,7 @@ export type UpdateJobParams = {
 export type JobClient = {
     get: () => Promise<Job | undefined>;
     update: UpdateJobProgress;
+    type: JobClientType;
 };
 export type UpdateJobProgress = ({ progress, status, info, data, }: Omit<UpdateJobParams, 'id'>) => Promise<{
     isCanceled: boolean;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobStatus = exports.JobType = void 0;
+exports.JobClientType = exports.JobStatus = exports.JobType = void 0;
 var JobType;
 (function (JobType) {
     JobType["UPDATE_TO_CROWDIN"] = "updateCrowdin";
@@ -16,3 +16,8 @@ var JobStatus;
     JobStatus["FAILED"] = "failed";
     JobStatus["CANCELED"] = "canceled";
 })(JobStatus = exports.JobStatus || (exports.JobStatus = {}));
+var JobClientType;
+(function (JobClientType) {
+    JobClientType["CRON"] = "cron";
+    JobClientType["MANUAL"] = "manual";
+})(JobClientType = exports.JobClientType || (exports.JobClientType = {}));

package/package.json

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