eservices-back-core 2.0.17 → 2.0.19

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.
@@ -1,7 +1,15 @@
1
1
  export default class CoreError extends Error {
2
2
  /**
3
- * @description Ошибка связана с получение информации о пользователе по его externalId. Одна из причин явяется
4
- * отсутсвие пользователя: он не был добавлен в таблицу User.
3
+ * @description Класс используется для более удобной работы с ошибками. Добавляет полей displayMessage, которое в
4
+ * конечном итоге middleware) будет использоваться в качестве message;
5
+ * @param displayMessage {String} Текстовое сообщение для пользователя
6
+ * @param insideError {any} Внутренняя ошибка
7
+ */
8
+ constructor(displayMessage: string, insideError?: unknown);
9
+ displayMessage: string;
10
+ /**
11
+ * @description Ошибка связана с получением информации о пользователе по его externalId. Одна из причин является
12
+ * отсутствие пользователя: он не был добавлен в таблицу User.
5
13
  */
6
14
  static UserNotFound(externalId: string): CoreError;
7
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"core-error.d.ts","sourceRoot":"","sources":["../../src/errors/core-error.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,KAAK;IAC3C;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM;CAGtC"}
1
+ {"version":3,"file":"core-error.d.ts","sourceRoot":"","sources":["../../src/errors/core-error.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,KAAK;IAE3C;;;;;OAKG;gBACS,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO;IAczD,cAAc,EAAE,MAAM,CAAA;IACtB;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM;CAGtC"}
@@ -2,8 +2,25 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  class CoreError extends Error {
4
4
  /**
5
- * @description Ошибка связана с получение информации о пользователе по его externalId. Одна из причин явяется
6
- * отсутсвие пользователя: он не был добавлен в таблицу User.
5
+ * @description Класс используется для более удобной работы с ошибками. Добавляет полей displayMessage, которое в
6
+ * конечном итоге middleware) будет использоваться в качестве message;
7
+ * @param displayMessage {String} Текстовое сообщение для пользователя
8
+ * @param insideError {any} Внутренняя ошибка
9
+ */
10
+ constructor(displayMessage, insideError) {
11
+ super();
12
+ this.displayMessage = displayMessage;
13
+ if (insideError instanceof Error) {
14
+ this.stack = insideError.stack;
15
+ this.message = insideError.message;
16
+ }
17
+ if (typeof insideError === 'string') {
18
+ this.message = insideError;
19
+ }
20
+ }
21
+ /**
22
+ * @description Ошибка связана с получением информации о пользователе по его externalId. Одна из причин является
23
+ * отсутствие пользователя: он не был добавлен в таблицу User.
7
24
  */
8
25
  static UserNotFound(externalId) {
9
26
  return new CoreError(`Can't read user information. External id ${externalId}`);
@@ -1 +1 @@
1
- {"version":3,"file":"core-error.js","sourceRoot":"","sources":["../../src/errors/core-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,SAAU,SAAQ,KAAK;IAC3C;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAkB;QACrC,OAAO,IAAI,SAAS,CAAC,4CAA4C,UAAU,EAAE,CAAC,CAAC;IAChF,CAAC;CACD;AARD,4BAQC"}
1
+ {"version":3,"file":"core-error.js","sourceRoot":"","sources":["../../src/errors/core-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,SAAU,SAAQ,KAAK;IAE3C;;;;;OAKG;IACH,YAAY,cAAsB,EAAE,WAAqB;QACxD,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QAErC,IAAI,WAAW,YAAY,KAAK,EAAE,CAAC;YAClC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;YAC/B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAA;QACnC,CAAC;QAED,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACrC,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC;QAC5B,CAAC;IACF,CAAC;IAGD;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAkB;QACrC,OAAO,IAAI,SAAS,CAAC,4CAA4C,UAAU,EAAE,CAAC,CAAC;IAChF,CAAC;CACD;AA9BD,4BA8BC"}
package/dist/index.d.ts CHANGED
@@ -3,6 +3,7 @@ import Server from "./Server";
3
3
  import { authModule } from "./middleware/auth-middleware";
4
4
  import Criterion from "./model/criterion";
5
5
  import { Logger } from "./logger/use-logger";
6
+ import CoreError from "./errors/core-error";
6
7
  import { ISocketOptions } from "./types/socket-type";
7
8
  import DataService from "./services/data-service";
8
9
  import Filter from "./utils/Filter";
@@ -13,7 +14,7 @@ import valuesToUpperCase from "./utils/values-to-upper-case";
13
14
  import getCriterionConfig from "./utils/get-criterion-config";
14
15
  import { getCriterionPresetFromCustomerRequestInfo } from "./utils/get-criterion-preset";
15
16
  import convertMasterEntity from "./utils/convert-master-entity";
16
- export { createServer, Server, Logger, Criterion, authModule, ISocketOptions, DataService, Filter, nodeFetch, joinURL, arrayToUpperCase, valuesToUpperCase, getCriterionConfig, getCriterionPresetFromCustomerRequestInfo, convertMasterEntity, };
17
+ export { createServer, Server, Logger, Criterion, authModule, ISocketOptions, DataService, Filter, nodeFetch, joinURL, arrayToUpperCase, valuesToUpperCase, getCriterionConfig, getCriterionPresetFromCustomerRequestInfo, convertMasterEntity, CoreError };
17
18
  import { ICustomerRequestInfo } from "./types/main";
18
19
  export type { ICustomerRequestInfo };
19
20
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AACxD,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAGnD,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAGlD,OAAO,MAAM,MAAM,gBAAgB,CAAC;AACpC,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAChC,OAAO,gBAAgB,MAAM,4BAA4B,CAAC;AAC1D,OAAO,iBAAiB,MAAM,8BAA8B,CAAC;AAC7D,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,yCAAyC,EAAC,MAAM,8BAA8B,CAAC;AACvF,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAChE,OAAO,EACN,YAAY,EACZ,MAAM,EACN,MAAM,EACN,SAAS,EACT,UAAU,EAEV,cAAc,EAEd,WAAW,EAEX,MAAM,EACN,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,yCAAyC,EACzC,mBAAmB,GAEnB,CAAA;AAED,OAAO,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAClD,YAAY,EACX,oBAAoB,EACpB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AACxD,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAC3C,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAG5C,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAGnD,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAGlD,OAAO,MAAM,MAAM,gBAAgB,CAAC;AACpC,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAChC,OAAO,gBAAgB,MAAM,4BAA4B,CAAC;AAC1D,OAAO,iBAAiB,MAAM,8BAA8B,CAAC;AAC7D,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,yCAAyC,EAAC,MAAM,8BAA8B,CAAC;AACvF,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAChE,OAAO,EACN,YAAY,EACZ,MAAM,EACN,MAAM,EACN,SAAS,EACT,UAAU,EAEV,cAAc,EAEd,WAAW,EAEX,MAAM,EACN,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,yCAAyC,EACzC,mBAAmB,EACnB,SAAS,EAET,CAAA;AAED,OAAO,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAClD,YAAY,EACX,oBAAoB,EACpB,CAAA"}
package/dist/index.js CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.convertMasterEntity = exports.getCriterionPresetFromCustomerRequestInfo = exports.getCriterionConfig = exports.valuesToUpperCase = exports.arrayToUpperCase = exports.joinURL = exports.nodeFetch = exports.Filter = exports.DataService = exports.authModule = exports.Criterion = exports.Logger = exports.Server = exports.createServer = void 0;
6
+ exports.CoreError = exports.convertMasterEntity = exports.getCriterionPresetFromCustomerRequestInfo = exports.getCriterionConfig = exports.valuesToUpperCase = exports.arrayToUpperCase = exports.joinURL = exports.nodeFetch = exports.Filter = exports.DataService = exports.authModule = exports.Criterion = exports.Logger = exports.Server = exports.createServer = void 0;
7
7
  const Server_1 = require("./Server");
8
8
  Object.defineProperty(exports, "createServer", { enumerable: true, get: function () { return Server_1.createServer; } });
9
9
  const Server_2 = __importDefault(require("./Server"));
@@ -14,6 +14,8 @@ const criterion_1 = __importDefault(require("./model/criterion"));
14
14
  exports.Criterion = criterion_1.default;
15
15
  const use_logger_1 = require("./logger/use-logger");
16
16
  Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return use_logger_1.Logger; } });
17
+ const core_error_1 = __importDefault(require("./errors/core-error"));
18
+ exports.CoreError = core_error_1.default;
17
19
  // SERVICES
18
20
  const data_service_1 = __importDefault(require("./services/data-service"));
19
21
  exports.DataService = data_service_1.default;
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAsC;AAsBrC,6FAtBO,qBAAY,OAsBP;AArBb,sDAA8B;AAsB7B,iBAtBM,gBAAM,CAsBN;AArBP,kEAAwD;AAwBvD,2FAxBO,4BAAU,OAwBP;AAvBX,kEAA0C;AAsBzC,oBAtBM,mBAAS,CAsBN;AArBV,oDAA2C;AAoB1C,uFApBO,mBAAM,OAoBP;AAfP,WAAW;AACX,2EAAkD;AAoBjD,sBApBM,sBAAW,CAoBN;AAlBZ,QAAQ;AACR,4DAAoC;AAmBnC,iBAnBM,gBAAM,CAmBN;AAlBP,kEAA0C;AAmBzC,oBAnBM,mBAAS,CAmBN;AAlBV,mCAAgC;AAmB/B,wFAnBO,eAAO,OAmBP;AAlBR,oFAA0D;AAmBzD,2BAnBM,4BAAgB,CAmBN;AAlBjB,wFAA6D;AAmB5D,4BAnBM,8BAAiB,CAmBN;AAlBlB,wFAA8D;AAmB7D,6BAnBM,8BAAkB,CAmBN;AAlBnB,uEAAuF;AAmBtF,0HAnBO,gEAAyC,OAmBP;AAlB1C,0FAAgE;AAmB/D,8BAnBM,+BAAmB,CAmBN"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAsC;AAuBrC,6FAvBO,qBAAY,OAuBP;AAtBb,sDAA8B;AAuB7B,iBAvBM,gBAAM,CAuBN;AAtBP,kEAAwD;AAyBvD,2FAzBO,4BAAU,OAyBP;AAxBX,kEAA0C;AAuBzC,oBAvBM,mBAAS,CAuBN;AAtBV,oDAA2C;AAqB1C,uFArBO,mBAAM,OAqBP;AApBP,qEAA4C;AAoC3C,oBApCM,oBAAS,CAoCN;AA/BV,WAAW;AACX,2EAAkD;AAoBjD,sBApBM,sBAAW,CAoBN;AAlBZ,QAAQ;AACR,4DAAoC;AAmBnC,iBAnBM,gBAAM,CAmBN;AAlBP,kEAA0C;AAmBzC,oBAnBM,mBAAS,CAmBN;AAlBV,mCAAgC;AAmB/B,wFAnBO,eAAO,OAmBP;AAlBR,oFAA0D;AAmBzD,2BAnBM,4BAAgB,CAmBN;AAlBjB,wFAA6D;AAmB5D,4BAnBM,8BAAiB,CAmBN;AAlBlB,wFAA8D;AAmB7D,6BAnBM,8BAAkB,CAmBN;AAlBnB,uEAAuF;AAmBtF,0HAnBO,gEAAyC,OAmBP;AAlB1C,0FAAgE;AAmB/D,8BAnBM,+BAAmB,CAmBN"}
@@ -1 +1 @@
1
- {"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCASV,OAAO,OAAO,QAAQ;AAAtD,wBAsBE"}
1
+ {"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCAUV,OAAO,OAAO,QAAQ;AAAtD,wBA+BE"}
@@ -18,6 +18,7 @@ const use_logger_1 = require("../logger/use-logger");
18
18
  const debug_1 = __importDefault(require("debug"));
19
19
  const utils_1 = require("../utils");
20
20
  const constants_1 = require("../constants");
21
+ const core_error_1 = __importDefault(require("../errors/core-error"));
21
22
  const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)("error-handler"));
22
23
  exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
23
24
  try {
@@ -25,6 +26,14 @@ exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, fun
25
26
  use_logger_1.Logger.error('Error level %o', err);
26
27
  if (typeof err === "string")
27
28
  return void res.status(400).json((0, error_response_dto_1.default)(err, 400));
29
+ if (err instanceof core_error_1.default) {
30
+ return void res.status(500).json({
31
+ message: err.displayMessage,
32
+ date: new Date().getTime(),
33
+ stack: err.stack,
34
+ error: err.message
35
+ });
36
+ }
28
37
  if (err instanceof api_error_1.default)
29
38
  return void res
30
39
  .status(err.status)
@@ -1 +1 @@
1
- {"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,qDAA4C;AAC5C,kDAA+B;AAC/B,oCAA0C;AAC1C,4CAAmD;AAEnD,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,IAAA,wBAAgB,EAAC,eAAe,CAAC,CAAC,CAAC;AAE7D,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAC/D,IAAI,CAAC;QACJ,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,mBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QAEpC,IAAI,OAAO,GAAG,KAAK,QAAQ;YAC1B,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAE9D,IAAI,GAAG,YAAY,mBAAQ;YAC1B,OAAO,KAAK,GAAG;iBACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;iBAClB,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QAEnD,IAAI,GAAG,YAAY,KAAK;YACvB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAEtE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,iCAAqB,CAAC,CAAA;IAChC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,iCAAqB,CAAC,CAAA;IAChC,CAAC;AACF,CAAC,CAAA,CAAC"}
1
+ {"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,qDAA4C;AAC5C,kDAA+B;AAC/B,oCAA0C;AAC1C,4CAAmD;AACnD,sEAA6C;AAE7C,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,IAAA,wBAAgB,EAAC,eAAe,CAAC,CAAC,CAAC;AAE7D,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAC/D,IAAI,CAAC;QACJ,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,mBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QAEpC,IAAI,OAAO,GAAG,KAAK,QAAQ;YAC1B,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAE9D,IAAI,GAAG,YAAY,oBAAS,EAAE,CAAC;YAC9B,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAChC,OAAO,EAAE,GAAG,CAAC,cAAc;gBAC3B,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;gBAC1B,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,KAAK,EAAE,GAAG,CAAC,OAAO;aAClB,CAAC,CAAA;QACH,CAAC;QAED,IAAI,GAAG,YAAY,mBAAQ;YAC1B,OAAO,KAAK,GAAG;iBACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;iBAClB,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QAEnD,IAAI,GAAG,YAAY,KAAK;YACvB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAEtE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,iCAAqB,CAAC,CAAA;IAChC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,iCAAqB,CAAC,CAAA;IAChC,CAAC;AACF,CAAC,CAAA,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eservices-back-core",
3
- "version": "2.0.17",
3
+ "version": "2.0.19",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {