@stemy/backend 3.5.8 → 3.5.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1270,6 +1270,14 @@
1270
1270
  return arr.reduce(function (flat, toFlatten) {
1271
1271
  return flat.concat(isArray(toFlatten) ? flatten(toFlatten) : toFlatten);
1272
1272
  }, []);
1273
+ }
1274
+ function wrapError(e, message, httpCode) {
1275
+ if (httpCode === void 0) { httpCode = 500; }
1276
+ if (e instanceof axios.AxiosError) {
1277
+ e.message = message;
1278
+ return e;
1279
+ }
1280
+ return new routingControllers.HttpError(httpCode, message + ": " + e);
1273
1281
  }
1274
1282
 
1275
1283
  var __decorate$B = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -1798,9 +1806,10 @@
1798
1806
  case 0:
1799
1807
  metadata = metadata || {};
1800
1808
  metadata.filename = metadata.filename || url;
1809
+ metadata.url = url;
1801
1810
  metadata.uploadTime = new Date().getTime();
1802
1811
  oneWeek = 1000 * 3600 * 24 * 7;
1803
- return [4 /*yield*/, this.find({ filename: url, "metadata.uploadTime": { $gt: metadata.uploadTime - oneWeek } })];
1812
+ return [4 /*yield*/, this.find({ "metadata.url": url, "metadata.uploadTime": { $gt: metadata.uploadTime - oneWeek } })];
1804
1813
  case 1:
1805
1814
  asset = _b.sent();
1806
1815
  if (asset)
@@ -5498,15 +5507,22 @@
5498
5507
  configurable: true
5499
5508
  });
5500
5509
  ErrorHandlerMiddleware.prototype.error = function (error, req, res, next) {
5510
+ var _a;
5501
5511
  return __awaiter$6(this, void 0, void 0, function () {
5502
5512
  var result;
5503
- return __generator(this, function (_a) {
5504
- switch (_a.label) {
5513
+ return __generator(this, function (_b) {
5514
+ switch (_b.label) {
5505
5515
  case 0: return [4 /*yield*/, this.getResult(error, req, res)];
5506
5516
  case 1:
5507
- result = _a.sent();
5517
+ result = _b.sent();
5508
5518
  if (this.isDev) {
5509
- console.log("ERROR", result, res.statusCode);
5519
+ if (error instanceof axios.AxiosError) {
5520
+ console.log("Axios error:", result);
5521
+ console.log(error.config.data);
5522
+ }
5523
+ else {
5524
+ console.log(((_a = error.constructor) === null || _a === void 0 ? void 0 : _a.name) || "Error", result, res.statusCode);
5525
+ }
5510
5526
  }
5511
5527
  res.json(result);
5512
5528
  return [2 /*return*/];
@@ -5516,38 +5532,43 @@
5516
5532
  };
5517
5533
  ErrorHandlerMiddleware.prototype.getResult = function (error, req, res) {
5518
5534
  return __awaiter$6(this, void 0, void 0, function () {
5519
- var result, _a, _b, _c;
5520
- return __generator(this, function (_d) {
5521
- switch (_d.label) {
5535
+ var result, _b, _c, _d;
5536
+ return __generator(this, function (_e) {
5537
+ switch (_e.label) {
5522
5538
  case 0:
5523
5539
  result = {};
5540
+ if (error instanceof axios.AxiosError) {
5541
+ res.status(error.response.status);
5542
+ result.message = error.message;
5543
+ result.error = error.response.data;
5544
+ result.headers = error.response.headers;
5545
+ result.url = "" + error.config.baseURL + error.config.url;
5546
+ return [2 /*return*/, result];
5547
+ }
5524
5548
  if (!(error instanceof routingControllers.BadRequestError)) return [3 /*break*/, 6];
5525
5549
  res.status(400);
5526
5550
  if (!(error.constructor.name === "ParamRequiredError")) return [3 /*break*/, 2];
5527
- _a = result;
5551
+ _b = result;
5528
5552
  return [4 /*yield*/, this.translator.getTranslation(req.language, "message.parameter-required.error")];
5529
5553
  case 1:
5530
- _a.message = _d.sent();
5554
+ _b.message = _e.sent();
5531
5555
  result.param = error.message;
5532
5556
  return [3 /*break*/, 5];
5533
5557
  case 2:
5534
- if (error instanceof axios.AxiosError) {
5535
- console.log(error.response);
5536
- }
5537
- _b = result;
5538
- _c = error.message;
5539
- if (_c) return [3 /*break*/, 4];
5558
+ _c = result;
5559
+ _d = error.message;
5560
+ if (_d) return [3 /*break*/, 4];
5540
5561
  return [4 /*yield*/, this.translator.getTranslation(req.language, "message.form-validation.error")];
5541
5562
  case 3:
5542
- _c = (_d.sent());
5543
- _d.label = 4;
5563
+ _d = (_e.sent());
5564
+ _e.label = 4;
5544
5565
  case 4:
5545
- _b.message = _c;
5566
+ _c.message = _d;
5546
5567
  result.errors = error["errors"];
5547
- if (this.isDev) {
5568
+ if (error.stack && this.isDev) {
5548
5569
  result.stack = error.stack;
5549
5570
  }
5550
- _d.label = 5;
5571
+ _e.label = 5;
5551
5572
  case 5: return [2 /*return*/, result];
5552
5573
  case 6:
5553
5574
  res.status(error.httpCode || 500);
@@ -7028,6 +7049,7 @@
7028
7049
  exports.uniqueItems = uniqueItems;
7029
7050
  exports.unwindStage = unwindStage;
7030
7051
  exports.valueToPromise = valueToPromise;
7052
+ exports.wrapError = wrapError;
7031
7053
  exports.writeFile = writeFile;
7032
7054
 
7033
7055
  Object.defineProperty(exports, '__esModule', { value: true });