@crowdin/app-project-module 0.37.0 → 0.39.0

package/out/storage/postgre.js

@@ -138,6 +138,18 @@ class PostgreStorage {
                 provider       varchar not null
             )
             `);
+            yield client.query(`
+            create table if not exists user_errors
+            (
+                id             serial primary key,
+                action         varchar not null,
+                message        varchar not null,
+                data           varchar,
+                created_at     varchar not null,
+                crowdin_id     varchar not null,
+                integration_id varchar
+            )
+            `);
         });
     }
     saveCrowdinCredentials(credentials) {
@@ -201,6 +213,7 @@ class PostgreStorage {
                 yield client.query('DELETE FROM files_snapshot WHERE crowdin_id = $1', [id]);
                 yield client.query('DELETE FROM app_metadata WHERE crowdin_id = $1', [id]);
                 yield client.query('DELETE FROM webhooks WHERE crowdin_id = $1', [id]);
+                yield client.query('DELETE FROM user_errors WHERE crowdin_id = $1', [id]);
             }));
         });
     }
@@ -263,6 +276,7 @@ class PostgreStorage {
                 yield client.query('DELETE FROM sync_settings where crowdin_id = $1', [crowdinId]);
                 yield client.query('DELETE FROM files_snapshot where crowdin_id = $1', [crowdinId]);
                 yield client.query('DELETE FROM webhooks where crowdin_id = $1', [crowdinId]);
+                yield client.query('DELETE FROM user_errors where crowdin_id = $1', [crowdinId]);
             }));
         });
     }
@@ -395,5 +409,40 @@ class PostgreStorage {
             yield this.executeQuery((client) => client.query(`DELETE FROM webhooks WHERE file_id IN ${placeholders} AND integration_id = $${++index} AND crowdin_id = $${++index} AND provider = $${++index}`, [...fileIds, integrationId, crowdinId, provider]));
         });
     }
+    getAllUserErrors(crowdinId, integrationId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            return this.executeQuery((client) => __awaiter(this, void 0, void 0, function* () {
+                let whereIntegrationCondition = 'integration_id is NULL';
+                const params = [crowdinId];
+                if (integrationId) {
+                    whereIntegrationCondition = 'integration_id = $2';
+                    params.push(integrationId);
+                }
+                const res = yield client.query(`SELECT id, action, message, data, created_at as "createdAt", integration_id as "integrationId", crowdin_id as "crowdinId" FROM user_errors WHERE crowdin_id = $1 AND ${whereIntegrationCondition}`, params);
+                return (res === null || res === void 0 ? void 0 : res.rows) || [];
+            }));
+        });
+    }
+    saveUserError(action, message, data, createdAt, crowdinId, integrationId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            yield this.executeQuery((client) => client.query('INSERT INTO user_errors(action, message, data, created_at, integration_id, crowdin_id) VALUES ($1, $2, $3, $4, $5, $6)', [action, message, data, createdAt, integrationId, crowdinId]));
+        });
+    }
+    deleteUserErrors(createdAt, crowdinId, integrationId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            yield this.executeQuery((client) => {
+                let whereIntegrationCondition = 'integration_id is NULL';
+                const params = [createdAt, crowdinId];
+                if (integrationId) {
+                    whereIntegrationCondition = 'integration_id = $3';
+                    params.push(integrationId);
+                }
+                return client.query(`DELETE FROM user_errors WHERE created_at < $1 AND crowdin_id = $2 AND ${whereIntegrationCondition}`, params);
+            });
+        });
+    }
 }
 exports.PostgreStorage = PostgreStorage;

package/out/storage/sqlite.d.ts

@@ -1,5 +1,5 @@
 import { Storage } from '.';
-import { CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncSettings, IntegrationWebhooks } from '../models';
+import { CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncSettings, IntegrationWebhooks, UserErrors } from '../models';
 export interface SQLiteStorageConfig {
     dbFolder: string;
 }
@@ -45,4 +45,7 @@ export declare class SQLiteStorage implements Storage {
     getWebhooks(fileId: string, integrationId: string, crowdinId: string, provider: string): Promise<IntegrationWebhooks | undefined>;
     saveWebhooks(fileId: string, integrationId: string, crowdinId: string, provider: string): Promise<void>;
     deleteWebhooks(fileIds: any[], integrationId: string, crowdinId: string, provider: string): Promise<void>;
+    getAllUserErrors(crowdinId: string, integrationId?: string): Promise<UserErrors[]>;
+    saveUserError(action: string, message: string, data: any, createdAt: string, crowdinId: string, integrationId?: string): Promise<void>;
+    deleteUserErrors(createAt: string, crowdinId: string, integrationId?: string): Promise<void>;
 }

package/out/storage/sqlite.js

@@ -195,6 +195,18 @@ class SQLiteStorage {
                 crowdin_id     varchar not null,
                 provider       varchar not null
             );
+            `, []);
+                yield this._run(`
+            create table if not exists user_errors
+            (
+                id             integer not null primary key autoincrement,
+                action         varchar not null,
+                message        varchar not null,
+                data           varchar     null,
+                created_at     varchar not null,
+                crowdin_id     varchar not null,
+                integration_id varchar     null
+            );
             `, []);
                 this._res && this._res();
                 // TODO: temporary code
@@ -251,6 +263,7 @@ class SQLiteStorage {
             yield this.run('DELETE FROM app_metadata WHERE crowdin_id = ?', [id]);
             yield this.run('DELETE FROM files_snapshot WHERE crowdin_id = ?', [id]);
             yield this.run('DELETE FROM webhooks WHERE crowdin_id = ?', [id]);
+            yield this.run('DELETE FROM user_errors WHERE crowdin_id = ?', [id]);
         });
     }
     saveIntegrationCredentials(id, credentials, crowdinId) {
@@ -291,6 +304,7 @@ class SQLiteStorage {
             yield this.run('DELETE FROM sync_settings where crowdin_id = ?', [crowdinId]);
             yield this.run('DELETE FROM files_snapshot where crowdin_id = ?', [crowdinId]);
             yield this.run('DELETE FROM webhooks where crowdin_id = ?', [crowdinId]);
+            yield this.run('DELETE FROM user_errors where crowdin_id = ?', [crowdinId]);
         });
     }
     saveMetadata(id, metadata, crowdinId) {
@@ -389,5 +403,28 @@ class SQLiteStorage {
             return this.run(`DELETE FROM webhooks WHERE file_id IN (${placeholders}) AND integration_id = ? AND crowdin_id = ? AND provider = ?`, [...fileIds, integrationId, crowdinId, provider]);
         });
     }
+    getAllUserErrors(crowdinId, integrationId) {
+        let whereIntegrationCondition = 'integration_id is NULL';
+        const params = [crowdinId];
+        if (integrationId) {
+            whereIntegrationCondition = 'integration_id = ?';
+            params.push(integrationId);
+        }
+        return this.each(`SELECT id, action, message, data, created_at as createdAt, integration_id as integrationId, crowdin_id as crowdinId FROM user_errors WHERE crowdin_id = ? AND ${whereIntegrationCondition}`, params);
+    }
+    saveUserError(action, message, data, createdAt, crowdinId, integrationId) {
+        return this.run('INSERT INTO user_errors(action, message, data, created_at, integration_id, crowdin_id) VALUES (?, ?, ?, ?, ?, ?)', [action, message, data, createdAt, integrationId, crowdinId]);
+    }
+    deleteUserErrors(createAt, crowdinId, integrationId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let whereIntegrationCondition = 'integration_id is NULL';
+            const params = [createAt, crowdinId];
+            if (integrationId) {
+                whereIntegrationCondition = 'integration_id = ?';
+                params.push(integrationId);
+            }
+            return this.run(`DELETE FROM user_errors WHERE created_at < ? AND crowdin_id = ? AND ${whereIntegrationCondition}`, params);
+        });
+    }
 }
 exports.SQLiteStorage = SQLiteStorage;

package/out/util/cron.js

@@ -103,6 +103,8 @@ function filesCron(config, integration, period) {
                         // 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,
                     },
                 },

package/out/util/logger.d.ts

@@ -20,6 +20,7 @@ interface CustomAxiosError extends AxiosError {
 }
 export declare class AppModuleError extends Error {
     data: any;
+    appData: any;
     isAxiosError: boolean;
     constructor(error: CustomAxiosError | Error | string, data?: any);
 }
@@ -27,4 +28,10 @@ export declare class AppModuleAggregateError extends Error {
     errors: Error[] | AppModuleError[];
     constructor(errors: Error[] | AppModuleError[], message: string);
 }
+export declare function handleUserError({ action, error, crowdinId, clientId, }: {
+    action: string;
+    error: Error | string;
+    crowdinId: string;
+    clientId?: string;
+}): Promise<void>;
 export {};

package/out/util/logger.js

@@ -22,9 +22,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppModuleAggregateError = exports.AppModuleError = exports.getErrorMessage = exports.isAxiosError = exports.logError = exports.log = exports.withContextError = exports.withContext = exports.prepareContext = exports.initialize = void 0;
+exports.handleUserError = 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"));
+const storage_1 = require("../storage");
 let logConfig;
 let onError;
 function initialize(config) {
@@ -49,6 +59,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 +70,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,6 +94,7 @@ function log(message, context) {
 }
 exports.log = log;
 function logError(e, context) {
+    var _a, _b, _c;
     if (onError) {
         onError(e, context);
     }
@@ -82,11 +103,20 @@ function logError(e, 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 : '',
+                },
             });
         }
         if (e instanceof AppModuleAggregateError) {
@@ -119,10 +149,10 @@ function errorOutputByType(error) {
                 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 });
+        console.error(message, { attributes: JSON.stringify({ request, response }) }, { backtrace: error.stack });
     }
     else {
-        console.error(message, error.data ? { attributes: error.data } : '', error.stack ? { backtrace: error.stack } : '');
+        console.error(message, error.data ? { attributes: typeof error.data === 'object' ? JSON.stringify(error.data) : error.data } : '', error.stack ? { backtrace: error.stack } : '');
     }
 }
 function isAxiosError(e) {
@@ -148,8 +178,11 @@ class AppModuleError extends Error {
         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;
+        this.appData = data;
+        if (typeof error !== 'string') {
+            this.data = Object.assign({}, error);
+        }
         if (isAxiosError(error)) {
             this.isAxiosError = true;
         }
@@ -164,3 +197,76 @@ class AppModuleAggregateError extends Error {
     }
 }
 exports.AppModuleAggregateError = AppModuleAggregateError;
+function storeUserError({ action, error, crowdinId, clientId, }) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+    return __awaiter(this, void 0, void 0, function* () {
+        const data = {};
+        if (isAxiosError(error)) {
+            data.requestParams = {
+                method: ((_a = error === null || error === void 0 ? void 0 : error.request) === null || _a === void 0 ? void 0 : _a.method) || ((_c = (_b = error === null || error === void 0 ? void 0 : error.data) === null || _b === void 0 ? void 0 : _b.request) === null || _c === void 0 ? void 0 : _c.method),
+                protocol: ((_d = error === null || error === void 0 ? void 0 : error.request) === null || _d === void 0 ? void 0 : _d.protocol) || ((_f = (_e = error === null || error === void 0 ? void 0 : error.data) === null || _e === void 0 ? void 0 : _e.request) === null || _f === void 0 ? void 0 : _f.protocol),
+                host: ((_g = error === null || error === void 0 ? void 0 : error.request) === null || _g === void 0 ? void 0 : _g.host) || ((_j = (_h = error === null || error === void 0 ? void 0 : error.data) === null || _h === void 0 ? void 0 : _h.request) === null || _j === void 0 ? void 0 : _j.host),
+                path: ((_k = error === null || error === void 0 ? void 0 : error.request) === null || _k === void 0 ? void 0 : _k.path) || ((_m = (_l = error === null || error === void 0 ? void 0 : error.data) === null || _l === void 0 ? void 0 : _l.request) === null || _m === void 0 ? void 0 : _m.path),
+            };
+            data.responseData = {
+                data: ((_o = error === null || error === void 0 ? void 0 : error.response) === null || _o === void 0 ? void 0 : _o.data) || ((_q = (_p = error === null || error === void 0 ? void 0 : error.data) === null || _p === void 0 ? void 0 : _p.response) === null || _q === void 0 ? void 0 : _q.data),
+                status: ((_r = error === null || error === void 0 ? void 0 : error.response) === null || _r === void 0 ? void 0 : _r.status) || ((_t = (_s = error === null || error === void 0 ? void 0 : error.data) === null || _s === void 0 ? void 0 : _s.response) === null || _t === void 0 ? void 0 : _t.status),
+                statusText: ((_u = error === null || error === void 0 ? void 0 : error.response) === null || _u === void 0 ? void 0 : _u.statusText) || ((_w = (_v = error === null || error === void 0 ? void 0 : error.data) === null || _v === void 0 ? void 0 : _v.response) === null || _w === void 0 ? void 0 : _w.statusText),
+            };
+        }
+        if (error instanceof AppModuleError && error.appData) {
+            data.appData = error.appData;
+        }
+        yield (0, storage_1.getStorage)().saveUserError(action, error.message, JSON.stringify(data), `${Date.now()}`, crowdinId, clientId);
+    });
+}
+function clearOldUserErrors(crowdinId, clientId) {
+    const date = new Date();
+    date.setMonth(date.getMonth() - 1); // previous month
+    (0, storage_1.getStorage)().deleteUserErrors(`${date.getTime()}`, crowdinId, clientId);
+}
+function mergeAppModuleAggregateErrors(errors) {
+    const result = [];
+    const mergedData = {};
+    for (const errorItem of errors) {
+        if (errorItem instanceof AppModuleError) {
+            if (typeof errorItem.appData === 'object' &&
+                errorItem.appData !== null &&
+                !Array.isArray(errorItem.appData)) {
+                if (!mergedData[errorItem.message]) {
+                    mergedData[errorItem.message] = {};
+                }
+                for (const key in errorItem.appData) {
+                    mergedData[errorItem.message][key] = (mergedData[errorItem.message][key] || []).concat(errorItem.appData[key]);
+                }
+            }
+            else if (errorItem.appData) {
+                mergedData[errorItem.message] = (mergedData[errorItem.message] || []).concat(errorItem.appData);
+            }
+            continue;
+        }
+        result.push(errorItem);
+    }
+    for (const key in mergedData) {
+        result.push(new AppModuleError(key, mergedData[key]));
+    }
+    return result;
+}
+function handleUserError({ action, error, crowdinId, clientId, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof error === 'string') {
+            return;
+        }
+        if (error instanceof AppModuleAggregateError) {
+            const mergedErrors = mergeAppModuleAggregateErrors(error.errors);
+            for (const key in mergedErrors) {
+                yield handleUserError({ action, error: mergedErrors[key], crowdinId, clientId });
+            }
+        }
+        else {
+            yield storeUserError({ action, error, crowdinId, clientId });
+            clearOldUserErrors(crowdinId, clientId);
+        }
+    });
+}
+exports.handleUserError = handleUserError;