@crowdin/app-project-module 0.36.0 → 0.38.0

package/out/static/js/main.js

@@ -53,7 +53,6 @@ function catchRejection(e, message) {
         subscriptionModal.open();
         return;
     }
-    console.error(e.message || message);
     showToast(e.message || message);
 }
 

package/out/util/connection.d.ts

@@ -1,9 +1,10 @@
 import Crowdin from '@crowdin/crowdin-api-client';
-import { AccountType, Config, CrowdinCredentials, IntegrationCredentials, IntegrationLogic, SubscriptionInfo } from '../models';
-export declare function prepareCrowdinClient({ config, credentials, autoRenew, }: {
+import { AccountType, Config, CrowdinContextInfo, CrowdinCredentials, IntegrationCredentials, IntegrationLogic, SubscriptionInfo } from '../models';
+export declare function prepareCrowdinClient({ config, credentials, autoRenew, context, }: {
     config: Config;
     credentials: CrowdinCredentials;
     autoRenew?: boolean;
+    context?: CrowdinContextInfo;
 }): Promise<{
     client: Crowdin;
     token: string;

package/out/util/connection.js

@@ -54,7 +54,7 @@ function refreshToken(config, credentials) {
         };
     });
 }
-function prepareCrowdinClient({ config, credentials, autoRenew = false, }) {
+function prepareCrowdinClient({ config, credentials, autoRenew = false, context, }) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         //2 min as an extra buffer
@@ -114,6 +114,7 @@ function prepareCrowdinClient({ config, credentials, autoRenew = false, }) {
                                     const res = yield axiosCustom.get(url, getHttpConfig(httpConfig));
                                     return res.data;
                                 }
+                                (0, logger_1.logError)(e, context);
                                 throw e;
                             }
                         });
@@ -130,6 +131,7 @@ function prepareCrowdinClient({ config, credentials, autoRenew = false, }) {
                                     const res = yield axiosCustom.delete(url, getHttpConfig(httpConfig));
                                     return res.data;
                                 }
+                                (0, logger_1.logError)(e, context);
                                 throw e;
                             }
                         });
@@ -146,6 +148,7 @@ function prepareCrowdinClient({ config, credentials, autoRenew = false, }) {
                                     const res = yield axiosCustom.head(url, getHttpConfig(httpConfig));
                                     return res.data;
                                 }
+                                (0, logger_1.logError)(e, context);
                                 throw e;
                             }
                         });
@@ -162,6 +165,7 @@ function prepareCrowdinClient({ config, credentials, autoRenew = false, }) {
                                     const res = yield axiosCustom.patch(url, data, getHttpConfig(httpConfig));
                                     return res.data;
                                 }
+                                (0, logger_1.logError)(e, context);
                                 throw e;
                             }
                         });
@@ -178,6 +182,7 @@ function prepareCrowdinClient({ config, credentials, autoRenew = false, }) {
                                     const res = yield axiosCustom.post(url, data, getHttpConfig(httpConfig));
                                     return res.data;
                                 }
+                                (0, logger_1.logError)(e, context);
                                 throw e;
                             }
                         });
@@ -194,6 +199,7 @@ function prepareCrowdinClient({ config, credentials, autoRenew = false, }) {
                                     const res = yield axiosCustom.put(url, data, getHttpConfig(httpConfig));
                                     return res.data;
                                 }
+                                (0, logger_1.logError)(e, context);
                                 throw e;
                             }
                         });

package/out/util/cron.js

@@ -95,10 +95,25 @@ function filesCron(config, integration, period) {
                 return;
             }
             const projectId = crowdinAppFunctions.getProjectId(integrationCredentials.id);
+            const context = {
+                jwtPayload: {
+                    context: {
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        project_id: projectId,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        organization_id: crowdinCredentials.organizationId,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        organization_domain: crowdinCredentials.domain,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        user_id: crowdinCredentials.userId,
+                    },
+                },
+            };
             const { client: crowdinClient, token } = yield (0, connection_1.prepareCrowdinClient)({
                 config,
                 credentials: crowdinCredentials,
                 autoRenew: true,
+                context,
             });
             const { expired } = yield (0, connection_1.checkSubscription)({
                 config,
@@ -159,7 +174,13 @@ function filesCron(config, integration, period) {
                     }
                 }
                 const apiCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
-                yield integration.updateIntegration(projectId, crowdinClient, apiCredentials, filesToProcess, rootFolder, intConfig);
+                try {
+                    yield integration.updateIntegration(projectId, crowdinClient, apiCredentials, filesToProcess, rootFolder, intConfig);
+                }
+                catch (e) {
+                    (0, logger_1.logError)(e, context);
+                    throw e;
+                }
                 if (Object.keys(newFiles).length) {
                     yield (0, storage_1.getStorage)().updateSyncSettings(JSON.stringify(Object.assign(Object.assign({}, files), newFiles)), syncSettings.integrationId, syncSettings.crowdinId, 'schedule', syncSettings.provider);
                     const currentFileSnapshot = yield (0, file_snapshot_1.getCrowdinSnapshot)(config, integration, crowdinClient, projectId, intConfig);
@@ -176,7 +197,13 @@ function filesCron(config, integration, period) {
                 const intFiles = allIntFiles.filter((file) => 'type' in file);
                 (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);
-                yield integration.updateCrowdin(projectId, crowdinClient, apiCredentials, intFiles, rootFolder, intConfig);
+                try {
+                    yield integration.updateCrowdin(projectId, crowdinClient, apiCredentials, intFiles, rootFolder, intConfig);
+                }
+                catch (e) {
+                    (0, logger_1.logError)(e, context);
+                    throw e;
+                }
                 if (Object.keys(newFiles).length) {
                     const newSyncSettingsFields = allIntFiles.map((file) => (Object.assign(Object.assign({}, file), { schedule: true, sync: false })));
                     yield (0, storage_1.getStorage)().updateSyncSettings(JSON.stringify(newSyncSettingsFields), syncSettings.integrationId, syncSettings.crowdinId, 'schedule', syncSettings.provider);

package/out/util/logger.d.ts

@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios';
 import { Config, CrowdinContextInfo } from '../models';
 export type LogFunction = (message: string) => void;
 export type LogErrorFunction = (error: any) => void;
@@ -12,4 +13,18 @@ export declare function withContext(context: CrowdinContextInfo): LogFunction;
 export declare function withContextError(context: CrowdinContextInfo): LogFunction;
 export declare function log(message: string, context?: CrowdinContextInfo): void;
 export declare function logError(e: any, context?: CrowdinContextInfo): void;
+export declare function isAxiosError(e: any): e is CustomAxiosError;
 export declare function getErrorMessage(err: any): any;
+interface CustomAxiosError extends AxiosError {
+    data?: any;
+}
+export declare class AppModuleError extends Error {
+    data: any;
+    isAxiosError: boolean;
+    constructor(error: CustomAxiosError | Error | string, data?: any);
+}
+export declare class AppModuleAggregateError extends Error {
+    errors: Error[] | AppModuleError[];
+    constructor(errors: Error[] | AppModuleError[], message: string);
+}
+export {};

package/out/util/logger.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getErrorMessage = exports.logError = exports.log = exports.withContextError = exports.withContext = exports.prepareContext = exports.initialize = void 0;
+exports.AppModuleAggregateError = exports.AppModuleError = exports.getErrorMessage = exports.isAxiosError = exports.logError = exports.log = exports.withContextError = exports.withContext = exports.prepareContext = exports.initialize = void 0;
 const logsFormatter = __importStar(require("@crowdin/logs-formatter"));
 let logConfig;
 let onError;
@@ -49,6 +49,7 @@ function withContextError(context) {
 }
 exports.withContextError = withContextError;
 function log(message, context) {
+    var _a, _b, _c;
     if (logConfig === null || logConfig === void 0 ? void 0 : logConfig.enabled) {
         if (logConfig.log) {
             logConfig.log(message, context);
@@ -59,11 +60,20 @@ function log(message, context) {
                 logsFormatter.setContext({
                     project: {
                         id: context.jwtPayload.context.project_id,
+                        identifier: (_a = context.jwtPayload.context.project_identifier) !== null && _a !== void 0 ? _a : '',
                         // eslint-disable-next-line @typescript-eslint/camelcase
                         organization_id: context.jwtPayload.context.organization_id,
                         // eslint-disable-next-line @typescript-eslint/camelcase
                         user_id: context.jwtPayload.context.user_id,
                     },
+                    user: {
+                        id: context.jwtPayload.context.user_id,
+                        login: (_b = context.jwtPayload.context.user_login) !== null && _b !== void 0 ? _b : '',
+                    },
+                    organization: {
+                        id: context.jwtPayload.context.organization_id,
+                        domain: (_c = context.jwtPayload.context.organization_domain) !== null && _c !== void 0 ? _c : '',
+                    },
                 });
                 prefix += ` Context [${JSON.stringify(prepareContext(context))}]`;
             }
@@ -74,37 +84,71 @@ function log(message, context) {
 }
 exports.log = log;
 function logError(e, context) {
+    var _a, _b, _c;
     if (onError) {
         onError(e, context);
     }
     else {
-        let message = `[${new Date().toISOString()}] Error.`;
         if (context) {
             logsFormatter.setContext({
                 project: {
                     id: context.jwtPayload.context.project_id,
+                    identifier: (_a = context.jwtPayload.context.project_identifier) !== null && _a !== void 0 ? _a : '',
                     // eslint-disable-next-line @typescript-eslint/camelcase
                     organization_id: context.jwtPayload.context.organization_id,
                     // eslint-disable-next-line @typescript-eslint/camelcase
                     user_id: context.jwtPayload.context.user_id,
                 },
+                user: {
+                    id: context.jwtPayload.context.user_id,
+                    login: (_b = context.jwtPayload.context.user_login) !== null && _b !== void 0 ? _b : '',
+                },
+                organization: {
+                    id: context.jwtPayload.context.organization_id,
+                    domain: (_c = context.jwtPayload.context.organization_domain) !== null && _c !== void 0 ? _c : '',
+                },
             });
-            message += ` Context ${JSON.stringify(prepareContext(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}`);
+        if (e instanceof AppModuleAggregateError) {
+            if (e.errors && e.errors.length > 0) {
+                for (const error of e.errors) {
+                    errorOutputByType(error);
+                }
+            }
         }
         else {
-            console.error(message, e);
+            errorOutputByType(e);
         }
     }
 }
 exports.logError = logError;
+function errorOutputByType(error) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    const message = error.message || error;
+    if (isAxiosError(error)) {
+        const request = error.config || error.data.config
+            ? {
+                url: ((_a = error.config) === null || _a === void 0 ? void 0 : _a.url) || ((_b = error.data) === null || _b === void 0 ? void 0 : _b.config.url),
+                method: ((_c = error.config) === null || _c === void 0 ? void 0 : _c.method) || ((_d = error.data) === null || _d === void 0 ? void 0 : _d.config.method),
+                data: ((_e = error.config) === null || _e === void 0 ? void 0 : _e.data) || ((_f = error.data) === null || _f === void 0 ? void 0 : _f.config.data),
+            }
+            : {};
+        const response = error.response || error.data.response
+            ? {
+                data: ((_g = error.response) === null || _g === void 0 ? void 0 : _g.data) || ((_h = error.data) === null || _h === void 0 ? void 0 : _h.response.data),
+                status: ((_j = error.response) === null || _j === void 0 ? void 0 : _j.status) || ((_k = error.data) === null || _k === void 0 ? void 0 : _k.response.status),
+            }
+            : {};
+        console.error(message, { attributes: { request, response } }, { backtrace: error.stack });
+    }
+    else {
+        console.error(message, error.data ? { attributes: error.data } : '', error.stack ? { backtrace: error.stack } : '');
+    }
+}
 function isAxiosError(e) {
     return !!e.isAxiosError;
 }
+exports.isAxiosError = isAxiosError;
 function getErrorMessage(err) {
     let message;
     if (typeof err === 'string') {
@@ -119,3 +163,24 @@ function getErrorMessage(err) {
     return message;
 }
 exports.getErrorMessage = getErrorMessage;
+class AppModuleError extends Error {
+    constructor(error, data) {
+        super(typeof error === 'string' ? error : error.message);
+        this.isAxiosError = false;
+        this.name = 'AppModuleError';
+        this.data = typeof error === 'string' ? Object.assign({}, data) : Object.assign(Object.assign({}, error), data);
+        this.stack = typeof error === 'string' ? this.stack : error.stack;
+        if (isAxiosError(error)) {
+            this.isAxiosError = true;
+        }
+    }
+}
+exports.AppModuleError = AppModuleError;
+class AppModuleAggregateError extends Error {
+    constructor(errors, message) {
+        super(message);
+        this.name = 'AppModuleAggregateError';
+        this.errors = errors;
+    }
+}
+exports.AppModuleAggregateError = AppModuleAggregateError;

package/out/util/webhooks.js

@@ -91,7 +91,7 @@ function registerWebhooks(config, integration, client, crowdinContext, apiCreden
             const webhookName = `${config.name} application hook ${crowdinContext.jwtPayload.sub}`;
             const webhookUrl = makeCrowdinWebhookUrl(config, integration, crowdinContext);
             const syncCondition = models_1.SyncCondition[Number(appSettings.condition)];
-            const events = HookConditionEvents[syncCondition];
+            const events = [...HookConditionEvents[syncCondition]];
             const webhook = yield getCrowdinProjectWebhook(config, client, projectId, webhookName);
             if (appSettings['new-crowdin-files']) {
                 events.push(exports.HookEvents.fileAdded);
@@ -226,8 +226,24 @@ function prepareWebhookData(config, integration, webhookUrlParam, provider) {
         let appSettings = {};
         const { projectId, crowdinId, clientId } = decodedUrlParam(config, webhookUrlParam);
         const crowdinCredentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(crowdinId);
-        const crowdinClient = yield (0, connection_1.prepareCrowdinClient)({ config, credentials: crowdinCredentials });
         const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(clientId);
+        const context = {
+            jwtPayload: {
+                context: {
+                    // eslint-disable-next-line @typescript-eslint/camelcase
+                    project_id: projectId,
+                    // eslint-disable-next-line @typescript-eslint/camelcase
+                    organization_id: crowdinCredentials === null || crowdinCredentials === void 0 ? void 0 : crowdinCredentials.organizationId,
+                    // eslint-disable-next-line @typescript-eslint/camelcase
+                    user_id: crowdinCredentials === null || crowdinCredentials === void 0 ? void 0 : crowdinCredentials.userId,
+                },
+            },
+        };
+        const crowdinClient = yield (0, connection_1.prepareCrowdinClient)({
+            config,
+            credentials: crowdinCredentials,
+            context,
+        });
         const preparedIntegrationCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
         if (integrationCredentials === null || integrationCredentials === void 0 ? void 0 : integrationCredentials.config) {
             appSettings = JSON.parse(integrationCredentials.config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.36.0",
+  "version": "0.38.0",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -16,8 +16,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.423.0",
     "@aws-sdk/s3-request-presigner": "^3.423.0",
-    "@crowdin/crowdin-apps-functions": "0.5.1",
-    "@crowdin/logs-formatter": "^2.0.3",
+    "@crowdin/crowdin-apps-functions": "0.6.0",
+    "@crowdin/logs-formatter": "^2.0.5",
     "@godaddy/terminus": "^4.12.1",
     "@types/pg": "^8.10.3",
     "amqplib": "^0.10.3",