@crowdin/app-project-module 0.28.0-13 → 0.28.0-2

package/out/storage/index.js

@@ -17,17 +17,20 @@ const sqlite_1 = require("./sqlite");
 let storage;
 function initialize(config) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (config.dbFolder) {
+            (0, util_1.log)('Using SQLite database', config.logger);
+            storage = new sqlite_1.SQLiteStorage({ dbFolder: config.dbFolder });
+        }
         if (config.postgreConfig) {
             (0, util_1.log)('Using PostgreSQL database', config.logger);
             storage = new postgre_1.PostgreStorage(config.postgreConfig);
         }
-        else if (config.mysqlConfig) {
+        if (config.mysqlConfig) {
             (0, util_1.log)('Using MySQL database', config.logger);
             storage = new mysql_1.MySQLStorage(config.mysqlConfig);
         }
-        else {
-            (0, util_1.log)('Using SQLite database', config.logger);
-            storage = new sqlite_1.SQLiteStorage({ dbFolder: config.dbFolder });
+        if (!storage) {
+            throw new Error('Database is not configured');
         }
         yield storage.migrate();
     });

package/out/util/cron.js

@@ -1,11 +1,7 @@
 "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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/out/util/defaults.d.ts

@@ -1,7 +1,6 @@
 import Crowdin, { SourceFilesModel } from '@crowdin/crowdin-api-client';
-import { ClientConfig, Config, IntegrationLogic } from '../models';
+import { Config, IntegrationLogic } from '../models';
 export declare function getRootFolder(config: Config, integration: IntegrationLogic, client: Crowdin, projectId: number): Promise<SourceFilesModel.Directory | undefined>;
 export declare function getOauthRoute(integration: IntegrationLogic): string;
-export declare function applyIntegrationModuleDefaults(config: Config, integration: IntegrationLogic): void;
+export declare function applyDefaults(config: Config, integration: IntegrationLogic): void;
 export declare function constructOauthUrl(config: Config, integration: IntegrationLogic): string;
-export declare function convertClientConfig(clientConfig: ClientConfig): Config;

package/out/util/defaults.js

@@ -1,11 +1,7 @@
 "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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -32,9 +28,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertClientConfig = exports.constructOauthUrl = exports.applyIntegrationModuleDefaults = exports.getOauthRoute = exports.getRootFolder = void 0;
+exports.constructOauthUrl = exports.applyDefaults = exports.getOauthRoute = exports.getRootFolder = void 0;
 const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
-const path_1 = require("path");
 function getRootFolder(config, integration, client, projectId) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!integration.withRootFolder) {
@@ -57,7 +52,7 @@ function getOauthRoute(integration) {
     return ((_a = integration.oauthLogin) === null || _a === void 0 ? void 0 : _a.redirectUriRoute) || '/oauth/code';
 }
 exports.getOauthRoute = getOauthRoute;
-function applyIntegrationModuleDefaults(config, integration) {
+function applyDefaults(config, integration) {
     var _a;
     if (!integration.getCrowdinFiles) {
         integration.getCrowdinFiles = (projectId, client, rootFolder) => __awaiter(this, void 0, void 0, function* () {
@@ -246,7 +241,7 @@ function applyIntegrationModuleDefaults(config, integration) {
         integration.webhooks.urlParam = 'crowdinData';
     }
 }
-exports.applyIntegrationModuleDefaults = applyIntegrationModuleDefaults;
+exports.applyDefaults = applyDefaults;
 function constructOauthUrl(config, integration) {
     var _a, _b, _c;
     const oauth = integration.oauthLogin;
@@ -262,15 +257,3 @@ function constructOauthUrl(config, integration) {
     return url;
 }
 exports.constructOauthUrl = constructOauthUrl;
-function convertClientConfig(clientConfig) {
-    const baseUrl = clientConfig.baseUrl || process.env.URL;
-    const clientId = clientConfig.clientId || process.env.CROWDIN_CLIENT_ID;
-    const clientSecret = clientConfig.clientSecret || process.env.CROWDIN_CLIENT_SECRET;
-    const port = clientConfig.port || process.env.PORT || 3000;
-    if (!baseUrl || !clientId || !clientSecret) {
-        throw new Error('One of following parameters are not defined [baseUrl, clientId, clientSecret]');
-    }
-    return Object.assign(Object.assign({}, clientConfig), { baseUrl: baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl, clientId,
-        clientSecret, port: Number(port), dbFolder: clientConfig.dbFolder || (0, path_1.join)(process.cwd(), 'db'), imagePath: clientConfig.imagePath || (0, path_1.join)(process.cwd(), 'logo.png') });
-}
-exports.convertClientConfig = convertClientConfig;

package/out/util/index.js

@@ -1,11 +1,7 @@
 "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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/out/util/webhooks.js

@@ -1,11 +1,7 @@
 "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);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -43,7 +39,6 @@ const index_1 = require("./index");
 const connection_1 = require("./connection");
 const storage_1 = require("../storage");
 const defaults_1 = require("./defaults");
-const util_1 = require("../util");
 const HookEvents = {
     ALL: ['file.translated', 'file.approved'],
     TRANSLATED: ['file.translated'],
@@ -254,7 +249,7 @@ function updateCrowdinFromWebhookRequest(integration, webhookData, req) {
         let filesToSync = [];
         const { projectId, crowdinClient, preparedIntegrationCredentials, rootFolder, appSettings, syncSettings } = webhookData;
         if ((_a = integration.webhooks) === null || _a === void 0 ? void 0 : _a.integrationWebhookInterceptor) {
-            filesToSync = yield ((_b = integration.webhooks) === null || _b === void 0 ? void 0 : _b.integrationWebhookInterceptor(projectId, crowdinClient.client, preparedIntegrationCredentials, rootFolder, appSettings, syncSettings, req));
+            filesToSync = yield ((_b = integration.webhooks) === null || _b === void 0 ? void 0 : _b.integrationWebhookInterceptor(projectId, crowdinClient.client, rootFolder, appSettings, syncSettings, req));
         }
         return yield integration.updateCrowdin(projectId, crowdinClient.client, preparedIntegrationCredentials, filesToSync, rootFolder, appSettings);
     });
@@ -289,20 +284,14 @@ function consumer(channel, config, integration) {
     return function (msg) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!msg) {
-                return;
-            }
-            try {
+            if (msg) {
                 const data = JSON.parse(msg.content.toString());
                 const urlParam = (_a = integration.webhooks) === null || _a === void 0 ? void 0 : _a.urlParam;
                 const webhookUrlParam = data.query[urlParam];
                 const webhookData = yield prepareWebhookData(config, integration, webhookUrlParam, 'integration');
                 yield updateCrowdinFromWebhookRequest(integration, webhookData, data);
+                channel.ack(msg);
             }
-            catch (e) {
-                (0, util_1.logError)(e, config.onError);
-            }
-            channel.ack(msg);
         });
     };
 }

package/out/views/form.handlebars

@@ -17,12 +17,8 @@
     </div>
     <crowdin-toasts></crowdin-toasts>
     <script>
-    /*<!--*/
-        var formGetDataUrl = '{{formGetDataUrl}}';
-        var formPostDataUrl = '{{formPostDataUrl}}';
-        var formSchema = {{{formSchema}}};
-        var formUiSchema = {{{formUiSchema}}};
-    /*-->*/
+        var formDataUrl = '{{formDataUrl}}';
+        var formSchema = JSON.parse('{{{formSchema}}}');
     </script>
     <script src="/assets/js/form.js"></script>
 </body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.28.0-13",
+  "version": "0.28.0-2",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -13,16 +13,16 @@
     "test": "jest"
   },
   "dependencies": {
-    "@crowdin/crowdin-apps-functions": "0.4.0",
-    "@types/pg": "^8.6.6",
+    "@crowdin/crowdin-apps-functions": "0.3.1",
+    "@types/pg": "^8.6.5",
     "amqplib": "^0.10.3",
     "crypto-js": "^4.0.0",
-    "express": "4.18.2",
+    "express": "4.17.1",
     "express-handlebars": "^5.3.4",
     "mysql2": "^2.3.3",
-    "node-cron": "^3.0.2",
-    "pg": "^8.10.0",
-    "sqlite3": "^5.1.6",
+    "node-cron": "^3.0.0",
+    "pg": "^8.8.0",
+    "sqlite3": "^5.0.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
@@ -43,24 +43,24 @@
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-terser": "^0.4.0",
     "@types/crypto-js": "^4.0.0",
-    "@types/express": "4.17.17",
+    "@types/express": "4.17.13",
     "@types/express-handlebars": "^5.3.1",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^12.20.55",
-    "@types/node-cron": "^3.0.7",
+    "@types/jest": "^29.2.5",
+    "@types/node": "^12.0.10",
+    "@types/node-cron": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^2.3.1",
     "@typescript-eslint/parser": "^2.3.1",
     "eslint": "^6.4.0",
     "eslint-config-prettier": "^6.3.0",
     "eslint-plugin-prettier": "^3.1.1",
-    "jest": "^29.5.0",
+    "jest": "^29.3.1",
     "jest-junit": "^15.0.0",
     "prettier": "^2.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rollup": "^3.20.2",
-    "ts-jest": "^29.0.5",
-    "typescript": "^4.9.5"
+    "rollup": "^3.18.0",
+    "ts-jest": "^29.0.3",
+    "typescript": "^4.4.4"
   },
   "repository": {
     "type": "git",

package/rollup.config.mjs

@@ -0,0 +1,31 @@
+import babel from '@rollup/plugin-babel';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import json from '@rollup/plugin-json';
+import replace from '@rollup/plugin-replace';
+import terser from '@rollup/plugin-terser';
+export default {
+    input: 'out/static/js/form.js',
+    output: {
+        file: 'out/static/js/form.js',
+        format: 'iife',
+        sourcemap: false,
+    },
+    plugins: [
+        nodeResolve({
+            browser: true,
+            extensions: ['.js'],
+        }),
+        replace({
+            preventAssignment: true,
+            'process.env.NODE_ENV': JSON.stringify( 'production' )
+        }),
+        json(),
+        babel({
+            babelHelpers: 'bundled',
+            presets: ['@babel/preset-react'],
+        }),
+        commonjs(),
+        terser(),
+    ],
+};

package/out/handlers/file-processing/file-download.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="qs" />
-import { Request, Response } from 'express';
-import { Config, FileProcessLogic } from '../../models';
-export default function handle(config: Config, processingConfig: FileProcessLogic, folderName: string): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/file-processing/pre-post-process.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="qs" />
-import { Response } from 'express';
-import { Config, FileImportExportLogic } from '../../models';
-export default function handle(baseConfig: Config, config: FileImportExportLogic, folderName: string): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/handlers/file-processing/pre-post-process.js

@@ -1,99 +0,0 @@
-"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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const models_1 = require("../../models");
-const util_1 = require("../../util");
-const files_1 = require("../../util/files");
-function handle(baseConfig, config, folderName) {
-    const folderPath = config.filesFolder || baseConfig.dbFolder;
-    if (!fs_1.default.existsSync(path_1.default.join(folderPath, folderName))) {
-        fs_1.default.mkdirSync(path_1.default.join(folderPath, folderName), { recursive: true });
-    }
-    return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        const response = {};
-        const baseFilesUrl = `${baseConfig.baseUrl}/file/download/${folderName}`;
-        const body = req.body;
-        let processingError;
-        let fileContent;
-        if (body.stringsUrl) {
-            fileContent = yield (0, files_1.getFileContent)(body.stringsUrl, true);
-        }
-        else if (body.strings) {
-            fileContent = body.strings;
-        }
-        else if (body.file.contentUrl) {
-            fileContent = yield (0, files_1.getFileContent)(body.file.contentUrl);
-        }
-        else if (body.file.content) {
-            fileContent = Buffer.from(body.file.content, 'base64').toString();
-        }
-        const fileProcessResult = yield config.fileProcess(body, fileContent, req.crowdinApiClient, req.crowdinContext, req.crowdinContext.jwtPayload.context.project_id);
-        switch (body.jobType) {
-            case models_1.ProcessFileJobType.PRE_IMPORT:
-            case models_1.ProcessFileJobType.POST_EXPORT:
-                const { contentFile, fileName, fileType, error: contentFileError, } = fileProcessResult;
-                if (contentFile) {
-                    const contentFileEncoded = Buffer.from(contentFile).toString('base64');
-                    if (Buffer.byteLength(contentFileEncoded, 'utf8') < files_1.MAX_BODY_SIZE) {
-                        response.content = contentFileEncoded;
-                    }
-                    else {
-                        let url;
-                        if (config.storeFile) {
-                            url = yield config.storeFile(contentFile);
-                        }
-                        else {
-                            const storedFile = yield (0, files_1.storeFile)(contentFile, path_1.default.join(folderPath, folderName));
-                            url = `${baseFilesUrl}?file=${storedFile}`;
-                        }
-                        response.contentUrl = url;
-                    }
-                }
-                if (fileName) {
-                    response.fileName = fileName;
-                }
-                if (fileType) {
-                    response.fileType = fileType;
-                }
-                processingError = contentFileError;
-                break;
-            case models_1.ProcessFileJobType.POST_IMPORT:
-            case models_1.ProcessFileJobType.PRE_EXPORT:
-                const { strings, error: stringsFileError } = fileProcessResult;
-                if (strings) {
-                    const stringsNDJson = strings.map((s) => JSON.stringify(s)).join('\n\r');
-                    if (Buffer.byteLength(stringsNDJson, 'utf8') < files_1.MAX_BODY_SIZE) {
-                        response.strings = strings;
-                    }
-                    else {
-                        let url;
-                        if (config.storeFile) {
-                            url = yield config.storeFile(stringsNDJson);
-                        }
-                        else {
-                            const storedFile = yield (0, files_1.storeFile)(stringsNDJson, path_1.default.join(folderPath, folderName));
-                            url = `${baseFilesUrl}?file=${storedFile}`;
-                        }
-                        response.stringsUrl = url;
-                    }
-                }
-                processingError = stringsFileError;
-                break;
-        }
-        res.send({ data: response, error: processingError ? { message: processingError } : undefined });
-    }), baseConfig.onError);
-}
-exports.default = handle;

package/out/util/files.d.ts

@@ -1,3 +0,0 @@
-export declare const MAX_BODY_SIZE: number;
-export declare function storeFile(fileContent: string, folder: string): Promise<string>;
-export declare function getFileContent(url: string, isString?: boolean): Promise<any>;

package/out/util/files.js

@@ -1,43 +0,0 @@
-"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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFileContent = exports.storeFile = exports.MAX_BODY_SIZE = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const axios_1 = __importDefault(require("axios"));
-exports.MAX_BODY_SIZE = 4.9 * 1024 * 1024; //4.9mb
-function storeFile(fileContent, folder) {
-    const fileName = `file${Date.now()}`;
-    return new Promise((res, rej) => fs_1.default.writeFile(path_1.default.join(folder, fileName), fileContent, (err) => {
-        if (err) {
-            rej(err);
-        }
-        else {
-            res(fileName);
-        }
-    }));
-}
-exports.storeFile = storeFile;
-function getFileContent(url, isString = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = (yield axios_1.default.get(url)).data;
-        if (isString) {
-            // the response is presented in the ndjson format
-            const jsonRows = response.split(/\n|\n\r/).filter(Boolean);
-            return jsonRows.map((jsonStringRow) => JSON.parse(jsonStringRow));
-        }
-        return response;
-    });
-}
-exports.getFileContent = getFileContent;