@stemy/backend 3.5.9 → 3.5.11

package/bundles/stemy-backend.umd.js

@@ -1270,6 +1270,20 @@
         return arr.reduce(function (flat, toFlatten) {
             return flat.concat(isArray(toFlatten) ? flatten(toFlatten) : toFlatten);
         }, []);
+    }
+    function wrapError(e, message, httpCode) {
+        if (httpCode === void 0) { httpCode = 500; }
+        if (e instanceof axios.AxiosError) {
+            e.message = message;
+            return e;
+        }
+        return new routingControllers.HttpError(httpCode, message + ": " + e);
+    }
+    function prepareUrl(ending) {
+        if (ending === void 0) { ending = ""; }
+        return function (url) {
+            return url ? "" + url.replace(/\/+$/, "") + ending : ending;
+        };
     }
 
     var __decorate$B = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -5499,15 +5513,22 @@
             configurable: true
         });
         ErrorHandlerMiddleware.prototype.error = function (error, req, res, next) {
+            var _a;
             return __awaiter$6(this, void 0, void 0, function () {
                 var result;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0: return [4 /*yield*/, this.getResult(error, req, res)];
                         case 1:
-                            result = _a.sent();
+                            result = _b.sent();
                             if (this.isDev) {
-                                console.log("ERROR", result, res.statusCode);
+                                if (error instanceof axios.AxiosError) {
+                                    console.log("Axios error:", result);
+                                    console.log(error.config.data);
+                                }
+                                else {
+                                    console.log(((_a = error.constructor) === null || _a === void 0 ? void 0 : _a.name) || "Error", result, res.statusCode);
+                                }
                             }
                             res.json(result);
                             return [2 /*return*/];
@@ -5517,38 +5538,43 @@
         };
         ErrorHandlerMiddleware.prototype.getResult = function (error, req, res) {
             return __awaiter$6(this, void 0, void 0, function () {
-                var result, _a, _b, _c;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var result, _b, _c, _d;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             result = {};
+                            if (error instanceof axios.AxiosError) {
+                                res.status(error.response.status);
+                                result.message = error.message;
+                                result.error = error.response.data;
+                                result.headers = error.response.headers;
+                                result.url = "" + error.config.baseURL + error.config.url;
+                                return [2 /*return*/, result];
+                            }
                             if (!(error instanceof routingControllers.BadRequestError)) return [3 /*break*/, 6];
                             res.status(400);
                             if (!(error.constructor.name === "ParamRequiredError")) return [3 /*break*/, 2];
-                            _a = result;
+                            _b = result;
                             return [4 /*yield*/, this.translator.getTranslation(req.language, "message.parameter-required.error")];
                         case 1:
-                            _a.message = _d.sent();
+                            _b.message = _e.sent();
                             result.param = error.message;
                             return [3 /*break*/, 5];
                         case 2:
-                            if (error instanceof axios.AxiosError) {
-                                console.log(error.response);
-                            }
-                            _b = result;
-                            _c = error.message;
-                            if (_c) return [3 /*break*/, 4];
+                            _c = result;
+                            _d = error.message;
+                            if (_d) return [3 /*break*/, 4];
                             return [4 /*yield*/, this.translator.getTranslation(req.language, "message.form-validation.error")];
                         case 3:
-                            _c = (_d.sent());
-                            _d.label = 4;
+                            _d = (_e.sent());
+                            _e.label = 4;
                         case 4:
-                            _b.message = _c;
+                            _c.message = _d;
                             result.errors = error["errors"];
-                            if (this.isDev) {
+                            if (error.stack && this.isDev) {
                                 result.stack = error.stack;
                             }
-                            _d.label = 5;
+                            _e.label = 5;
                         case 5: return [2 /*return*/, result];
                         case 6:
                             res.status(error.httpCode || 500);
@@ -7011,6 +7037,7 @@
     exports.padRight = padRight;
     exports.paginate = paginate;
     exports.paginateAggregations = paginateAggregations;
+    exports.prepareUrl = prepareUrl;
     exports.projectStage = projectStage;
     exports.promiseTimeout = promiseTimeout;
     exports.rand = rand;
@@ -7029,6 +7056,7 @@
     exports.uniqueItems = uniqueItems;
     exports.unwindStage = unwindStage;
     exports.valueToPromise = valueToPromise;
+    exports.wrapError = wrapError;
     exports.writeFile = writeFile;
 
     Object.defineProperty(exports, '__esModule', { value: true });