@crowdin/app-project-module 0.31.0 → 0.32.1

package/out/util/index.js

@@ -32,9 +32,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogoUrl = exports.isExtendedResultType = exports.executeWithRetry = exports.decryptData = exports.encryptData = exports.logError = exports.runAsyncWrapper = exports.getMessage = exports.log = exports.CodeError = void 0;
+exports.getLogoUrl = exports.isExtendedResultType = exports.executeWithRetry = exports.decryptData = exports.encryptData = exports.runAsyncWrapper = exports.CodeError = void 0;
 const crypto = __importStar(require("crypto-js"));
 const storage_1 = require("../storage");
+const logger_1 = require("./logger");
 class CodeError extends Error {
     constructor(message, code) {
         super(message);
@@ -42,39 +43,12 @@ class CodeError extends Error {
     }
 }
 exports.CodeError = CodeError;
-function log(message, logger) {
-    if (logger === null || logger === void 0 ? void 0 : logger.enabled) {
-        if (logger.log) {
-            logger.log(message);
-        }
-        else {
-            const timestamp = new Date().toISOString();
-            // eslint-disable-next-line no-console
-            console.log(`[${timestamp}] ${message}`);
-        }
-    }
-}
-exports.log = log;
 function isCrowdinClientRequest(req) {
     return req.crowdinContext;
 }
-function getMessage(err) {
-    let message;
-    if (typeof err === 'string') {
-        message = err;
-    }
-    else if (err.message) {
-        message = err.message;
-    }
-    else {
-        message = JSON.stringify(err);
-    }
-    return message;
-}
-exports.getMessage = getMessage;
 function handleError(err, req, res) {
     return __awaiter(this, void 0, void 0, function* () {
-        const code = err.code ? err.code : 500;
+        const code = err.code && typeof err.code === 'number' ? err.code : 500;
         if (code === 401 && isCrowdinClientRequest(req)) {
             yield (0, storage_1.getStorage)().deleteIntegrationCredentials(req.crowdinContext.clientId);
         }
@@ -82,27 +56,23 @@ function handleError(err, req, res) {
             res.redirect('/');
             return;
         }
-        res.status(code).send({ message: getMessage(err), code });
+        res.status(code).send({ message: (0, logger_1.getErrorMessage)(err), code });
     });
 }
-function runAsyncWrapper(callback, onError) {
+function runAsyncWrapper(callback) {
     return (req, res, next) => {
         callback(req, res, next).catch((e) => {
-            logError(e, onError);
+            if (isCrowdinClientRequest(req)) {
+                req.logError(e);
+            }
+            else {
+                (0, logger_1.logError)(e);
+            }
             handleError(e, req, res);
         });
     };
 }
 exports.runAsyncWrapper = runAsyncWrapper;
-function logError(e, onError) {
-    if (onError) {
-        onError(e);
-    }
-    else {
-        console.error(e);
-    }
-}
-exports.logError = logError;
 function encryptData(config, data) {
     return crypto.AES.encrypt(data, config.cryptoSecret || config.clientSecret).toString();
 }
@@ -133,7 +103,7 @@ function isExtendedResultType(data) {
     return !!dataTyped && !Array.isArray(dataTyped);
 }
 exports.isExtendedResultType = isExtendedResultType;
-function getLogoUrl(config, moduleConfig, modulePath) {
+function getLogoUrl(moduleConfig, modulePath) {
     if (!moduleConfig && !modulePath) {
         return '/logo.png';
     }

package/out/util/logger.d.ts

@@ -0,0 +1,14 @@
+import { Config } from '../models';
+export type LogFunction = (message: string) => void;
+export type LogErrorFunction = (error: any) => void;
+export type LogContext = {
+    userId: string;
+    orgId: string;
+    projectId: number;
+};
+export declare function initialize(config: Config): void;
+export declare function withContext(context: LogContext): LogFunction;
+export declare function withContextError(context: LogContext): LogFunction;
+export declare function log(message: string, context?: LogContext): void;
+export declare function logError(e: any, context?: LogContext): void;
+export declare function getErrorMessage(err: any): any;

package/out/util/logger.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getErrorMessage = exports.logError = exports.log = exports.withContextError = exports.withContext = exports.initialize = void 0;
+let logConfig;
+let onError;
+function initialize(config) {
+    logConfig = config.logger;
+    onError = config.onError;
+}
+exports.initialize = initialize;
+function withContext(context) {
+    return (message) => log(message, context);
+}
+exports.withContext = withContext;
+function withContextError(context) {
+    return (e) => logError(e, context);
+}
+exports.withContextError = withContextError;
+function log(message, context) {
+    if (logConfig === null || logConfig === void 0 ? void 0 : logConfig.enabled) {
+        if (logConfig.log) {
+            logConfig.log(message, context);
+        }
+        else {
+            let prefix = `[${new Date().toISOString()}]`;
+            if (context) {
+                prefix += ` Context [${JSON.stringify(context)}]`;
+            }
+            // eslint-disable-next-line no-console
+            console.log(`${prefix} ${message}`);
+        }
+    }
+}
+exports.log = log;
+function logError(e, context) {
+    if (onError) {
+        onError(e, context);
+    }
+    else {
+        let message = `[${new Date().toISOString()}] Error.`;
+        if (context) {
+            message += ` Context ${JSON.stringify(context)}`;
+        }
+        if (isAxiosError(e)) {
+            const request = e.config ? { url: e.config.url, method: e.config.method, data: e.config.data } : {};
+            const response = e.response ? { data: e.response.data, status: e.response.status } : {};
+            console.error(`${message} Axios error. Request ${JSON.stringify(request)}. Response ${JSON.stringify(response)}. Message ${e.message}`);
+        }
+        else {
+            console.error(message, e);
+        }
+    }
+}
+exports.logError = logError;
+function isAxiosError(e) {
+    return !!e.isAxiosError;
+}
+function getErrorMessage(err) {
+    let message;
+    if (typeof err === 'string') {
+        message = err;
+    }
+    else if (err.message) {
+        message = err.message;
+    }
+    else {
+        message = 'Internal Server Error';
+    }
+    return message;
+}
+exports.getErrorMessage = getErrorMessage;

package/out/util/synced-files.js

@@ -11,19 +11,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrUpdateSyncedFiles = void 0;
 const storage_1 = require("../storage");
-const index_1 = require("./index");
+const logger_1 = require("./logger");
 function createOrUpdateSyncedFiles(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { config, req } = args;
+        const { req } = args;
         let fileIds = args.fileIds;
         const existingFiles = yield (0, storage_1.getStorage)().getSyncedFiles(req.crowdinContext.clientId, req.crowdinContext.crowdinId);
         if (existingFiles) {
             fileIds = [...new Set([...JSON.parse(existingFiles.fileIds), ...fileIds])];
-            (0, index_1.log)(`Updating synced files ${JSON.stringify(fileIds, null, 2)}`, config.logger);
+            (0, logger_1.log)(`Updating synced files ${JSON.stringify(fileIds, null, 2)}`);
             yield (0, storage_1.getStorage)().updateSyncedFiles(JSON.stringify(fileIds), req.crowdinContext.clientId, req.crowdinContext.crowdinId);
         }
         else {
-            (0, index_1.log)(`Saving synced files ${JSON.stringify(fileIds, null, 2)}`, config.logger);
+            (0, logger_1.log)(`Saving synced files ${JSON.stringify(fileIds, null, 2)}`);
             yield (0, storage_1.getStorage)().saveSyncedFiles(JSON.stringify(fileIds), req.crowdinContext.clientId, req.crowdinContext.crowdinId);
         }
     });

package/out/util/webhooks.d.ts

@@ -1,6 +1,6 @@
 import Crowdin from '@crowdin/crowdin-api-client';
-import { Config, CrowdinContextInfo, IntegrationLogic, IntegrationSyncSettings, Payload, Provider, TreeItem, UpdateCrowdinWebhookPayloadsArgs, UpdateIntegrationRequest, WebhookUrlParams } from '../models';
 import { WebhooksModel } from '@crowdin/crowdin-api-client/out/webhooks';
+import { Config, CrowdinContextInfo, IntegrationLogic, IntegrationSyncSettings, Payload, Provider, TreeItem, UpdateCrowdinWebhookPayloadsArgs, UpdateIntegrationRequest, WebhookUrlParams } from '../models';
 export declare function encodedUrlParam(config: Config, integration: IntegrationLogic, crowdinContext: CrowdinContextInfo): string;
 export declare function decodedUrlParam(config: Config, data: string): WebhookUrlParams;
 export declare function makeCrowdinWebhookUrl(config: Config, integration: IntegrationLogic, crowdinContext: CrowdinContextInfo): string;

package/out/util/webhooks.js

@@ -39,12 +39,12 @@ exports.listenQueueMessage = exports.updateCrowdinFromWebhookRequest = exports.p
 const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
 const amqplib_1 = __importDefault(require("amqplib"));
 const models_1 = require("../models");
-const index_1 = require("./index");
-const connection_1 = require("./connection");
 const storage_1 = require("../storage");
+const connection_1 = require("./connection");
 const defaults_1 = require("./defaults");
-const util_1 = require("../util");
 const file_snapshot_1 = require("./file-snapshot");
+const index_1 = require("./index");
+const logger_1 = require("./logger");
 const HookEvents = {
     ALL: ['file.translated', 'file.approved'],
     TRANSLATED: ['file.translated'],
@@ -200,7 +200,7 @@ function unregisterAllCrowdinWebhooks(config, integration, crowdinId) {
             if (crowdinCredentials) {
                 const credentials = yield (0, storage_1.getStorage)().getAllIntegrationCredentials(crowdinId);
                 const projectIds = credentials.map((c) => crowdinAppFunctions.getProjectId(c.id));
-                const crowdinClient = yield (0, connection_1.prepareCrowdinClient)(config, crowdinCredentials);
+                const crowdinClient = yield (0, connection_1.prepareCrowdinClient)({ config, credentials: crowdinCredentials });
                 yield Promise.all(projectIds.map((projectId) => __awaiter(this, void 0, void 0, function* () {
                     const webhooks = yield getAllCrowdinProjectWebhooks(config, crowdinClient.client, projectId);
                     yield Promise.all(webhooks.map((hook) => __awaiter(this, void 0, void 0, function* () { return yield unregisterCrowdinWebhooks(config, crowdinClient.client, projectId, hook); })));
@@ -236,7 +236,7 @@ function prepareWebhookData(config, integration, webhookUrlParam, provider) {
         let newFiles = [];
         const { projectId, crowdinId, clientId } = decodedUrlParam(config, webhookUrlParam);
         const crowdinCredentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(crowdinId);
-        const crowdinClient = yield (0, connection_1.prepareCrowdinClient)(config, crowdinCredentials);
+        const crowdinClient = yield (0, connection_1.prepareCrowdinClient)({ config, credentials: crowdinCredentials });
         const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(clientId);
         const preparedIntegrationCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
         if (integrationCredentials === null || integrationCredentials === void 0 ? void 0 : integrationCredentials.config) {
@@ -338,7 +338,7 @@ function consumer(channel, config, integration) {
                 yield updateCrowdinFromWebhookRequest({ integration, webhookData, req: data });
             }
             catch (e) {
-                (0, util_1.logError)(e, config.onError);
+                (0, logger_1.logError)(e);
             }
             channel.ack(msg);
         });

package/package.json

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