eservices-back-core 2.1.107 → 2.1.109

package/dist/classes/client-error-generator.d.ts

@@ -3,9 +3,9 @@
  */
 export default class ClientErrorGenerator {
     message: string;
-    traceId: string;
+    traceId?: string;
     statusCode?: number;
-    details: unknown;
+    details?: unknown;
     constructor(params: IClientErrorParams);
     static apply(error: unknown): ClientErrorGenerator;
     private static parseCoreError;

package/dist/classes/client-error-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-error-generator.d.ts","sourceRoot":"","sources":["../../src/classes/client-error-generator.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAEjC,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;gBAEX,MAAM,EAAE,kBAAkB;IAOtC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO;IAwB3B,OAAO,CAAC,MAAM,CAAC,cAAc;CAO7B;AAED,UAAU,kBAAkB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB"}
+{"version":3,"file":"client-error-generator.d.ts","sourceRoot":"","sources":["../../src/classes/client-error-generator.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;gBAEb,MAAM,EAAE,kBAAkB;IAQtC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO;IAgC3B,OAAO,CAAC,MAAM,CAAC,cAAc;CAQ7B;AAED,UAAU,kBAAkB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB"}

package/dist/classes/client-error-generator.js

@@ -15,34 +15,39 @@ class ClientErrorGenerator {
         this.message = params.message;
         this.traceId = params.traceId;
         this.statusCode = params.statusCode;
-        // this.details = params.details;
+        this.details = params.details || [];
     }
     static apply(error) {
         if (error instanceof app_server_error_1.default) {
+            // Для 4xx сохраняем переданные детали, но оставляем стандартное сообщение
+            const clientError = ClientErrorGenerator.parseCoreError(error);
+            clientError.statusCode = error.status;
             if (error.status >= 400 && error.status < 500) {
-                const clientError = ClientErrorGenerator.parseCoreError(error);
                 clientError.statusCode = error.status;
                 clientError.details = error.details;
-                return clientError;
+                clientError.message = error.message;
             }
-            return ClientErrorGenerator.parseCoreError(error);
+            return clientError;
         }
         if (error instanceof api_error_1.default) {
             const clientError = ClientErrorGenerator.parseCoreError(error);
             clientError.statusCode = error.statusCode;
             return clientError;
         }
-        if (error instanceof core_error_1.default)
+        if (error instanceof core_error_1.default) {
             return ClientErrorGenerator.parseCoreError(error);
+        }
+        // Неизвестный тип ошибки
         return new ClientErrorGenerator({
-            message: constants_1.DEFAULT_ERROR_MESSAGE
+            message: constants_1.DEFAULT_ERROR_MESSAGE,
+            traceId: 'unknown'
         });
     }
     static parseCoreError(error) {
         return new ClientErrorGenerator({
             message: constants_1.DEFAULT_ERROR_MESSAGE,
             traceId: error.traceId,
-            details: error.details
+            // details: error.details
         });
     }
 }

package/dist/classes/client-error-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-error-generator.js","sourceRoot":"","sources":["../../src/classes/client-error-generator.ts"],"names":[],"mappings":";;;;;AAAA,oEAA2C;AAC3C,sEAA6C;AAC7C,4CAAmD;AACnD,kFAAwD;AAExD;;GAEG;AACH,MAAqB,oBAAoB;IAOxC,YAAY,MAA0B;QACrC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,iCAAiC;IAClC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAc;QAC1B,IAAI,KAAK,YAAY,0BAAc,EAAE,CAAC;YACrC,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC/C,MAAM,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBAC/D,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;gBACtC,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;gBACnC,OAAO,WAAW,CAAC;YACpB,CAAC;YACD,OAAO,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QAClD,CAAC;QAED,IAAI,KAAK,YAAY,mBAAQ,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC/D,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;YAC1C,OAAO,WAAW,CAAC;QACpB,CAAC;QAED,IAAI,KAAK,YAAY,oBAAS;YAAE,OAAO,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QAEjF,OAAO,IAAI,oBAAoB,CAAC;YAC/B,OAAO,EAAE,iCAAqB;SAC9B,CAAC,CAAA;IACH,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,KAAgB;QAC7C,OAAO,IAAI,oBAAoB,CAAC;YAC/B,OAAO,EAAE,iCAAqB;YAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;SACtB,CAAC,CAAA;IACH,CAAC;CACD;AA7CD,uCA6CC"}
+{"version":3,"file":"client-error-generator.js","sourceRoot":"","sources":["../../src/classes/client-error-generator.ts"],"names":[],"mappings":";;;;;AAAA,oEAA2C;AAC3C,sEAA6C;AAC7C,4CAAmD;AACnD,kFAAwD;AAExD;;GAEG;AACH,MAAqB,oBAAoB;IAMxC,YAAY,MAA0B;QACrC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACrC,CAAC;IAGD,MAAM,CAAC,KAAK,CAAC,KAAc;QAE1B,IAAI,KAAK,YAAY,0BAAc,EAAE,CAAC;YACrC,0EAA0E;YAC1E,MAAM,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC/D,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;YACtC,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC/C,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;gBACtC,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;gBACnC,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YACrC,CAAC;YAED,OAAO,WAAW,CAAC;QACpB,CAAC;QAED,IAAI,KAAK,YAAY,mBAAQ,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC/D,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;YAC1C,OAAO,WAAW,CAAC;QACpB,CAAC;QAED,IAAI,KAAK,YAAY,oBAAS,EAAE,CAAC;YAChC,OAAO,oBAAoB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACnD,CAAC;QAED,yBAAyB;QACzB,OAAO,IAAI,oBAAoB,CAAC;YAC/B,OAAO,EAAE,iCAAqB;YAC9B,OAAO,EAAE,SAAS;SAClB,CAAC,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,cAAc,CAAC,KAAgB;QAC7C,OAAO,IAAI,oBAAoB,CAAC;YAC/B,OAAO,EAAE,iCAAqB;YAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;YAEtB,yBAAyB;SACzB,CAAC,CAAC;IACJ,CAAC;CACD;AAtDD,uCAsDC"}

package/dist/errors/app-server-error.d.ts

@@ -30,5 +30,7 @@ export default class AppServerError extends CoreError {
      * @constructor
      */
     static FailedRequest(appServerError: string, details: unknown, status: number): AppServerError;
+    static NetworkError(): AppServerError;
+    static ParseError(message: string, error: any): AppServerError;
 }
 //# sourceMappingURL=app-server-error.d.ts.map

package/dist/errors/app-server-error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-server-error.d.ts","sourceRoot":"","sources":["../../src/errors/app-server-error.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,SAAS;IACpD;;OAEG;IACI,MAAM,EAAE,MAAM,CAAA;gBAET,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;IAMzD;;;OAGG;IACH,MAAM,CAAC,eAAe;IAItB;;;;OAIG;IACH,MAAM,CAAC,kBAAkB;IAIzB;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM;IAI7C;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;CAI7E"}
+{"version":3,"file":"app-server-error.d.ts","sourceRoot":"","sources":["../../src/errors/app-server-error.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,SAAS;IACpD;;OAEG;IACI,MAAM,EAAE,MAAM,CAAA;gBAET,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;IAMzD;;;OAGG;IACH,MAAM,CAAC,eAAe;IAItB;;;;OAIG;IACH,MAAM,CAAC,kBAAkB;IAIzB;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM;IAI7C;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;IAI7E,MAAM,CAAC,YAAY;IAGnB,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;CAG7C"}

package/dist/errors/app-server-error.js

@@ -42,6 +42,12 @@ class AppServerError extends core_error_1.default {
     static FailedRequest(appServerError, details, status) {
         return new AppServerError(appServerError, [details, "AppServer successfully processed the request, but returned an error."], status);
     }
+    static NetworkError() {
+        return new AppServerError("Network Error", ["The request to app-server failed. No response was received. Check the configuration and network status."], 500);
+    }
+    static ParseError(message, error) {
+        return new AppServerError(message, [error], 500);
+    }
 }
 exports.default = AppServerError;
 //# sourceMappingURL=app-server-error.js.map

package/dist/errors/app-server-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-server-error.js","sourceRoot":"","sources":["../../src/errors/app-server-error.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AAErC;;GAEG;AACH,MAAqB,cAAe,SAAQ,oBAAS;IAMpD,YAAY,OAAe,EAAE,OAAY,EAAE,MAAc;QACxD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAExB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,eAAe;QACrB,OAAO,IAAI,cAAc,CAAC,iGAAiG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IACvI,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kBAAkB;QACxB,OAAO,IAAI,cAAc,CAAC,6CAA6C,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IAClF,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,WAAmB;QAC5C,OAAO,IAAI,cAAc,CAAC,gDAAgD,WAAW,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACnG,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,cAAsB,EAAE,OAAgB,EAAE,MAAc;QAC5E,OAAO,IAAI,cAAc,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,sEAAsE,CAAC,EAAE,MAAM,CAAC,CAAA;IACrI,CAAC;CAED;AA9CD,iCA8CC"}
+{"version":3,"file":"app-server-error.js","sourceRoot":"","sources":["../../src/errors/app-server-error.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AAErC;;GAEG;AACH,MAAqB,cAAe,SAAQ,oBAAS;IAMpD,YAAY,OAAe,EAAE,OAAY,EAAE,MAAc;QACxD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAExB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,eAAe;QACrB,OAAO,IAAI,cAAc,CAAC,iGAAiG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IACvI,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kBAAkB;QACxB,OAAO,IAAI,cAAc,CAAC,6CAA6C,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IAClF,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,WAAmB;QAC5C,OAAO,IAAI,cAAc,CAAC,gDAAgD,WAAW,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACnG,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,cAAsB,EAAE,OAAgB,EAAE,MAAc;QAC5E,OAAO,IAAI,cAAc,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,sEAAsE,CAAC,EAAE,MAAM,CAAC,CAAA;IACrI,CAAC;IAED,MAAM,CAAC,YAAY;QAClB,OAAO,IAAI,cAAc,CAAC,eAAe,EAAE,CAAC,yGAAyG,CAAC,EAAE,GAAG,CAAC,CAAA;IAC7J,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,OAAe,EAAE,KAAU;QAC5C,OAAO,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAA;IACjD,CAAC;CACD;AApDD,iCAoDC"}

package/dist/middleware/error-middleware.d.ts

@@ -1,4 +1,4 @@
-import { Request, Response } from "express";
-declare const _default: (err: any, req: Request, res: Response, next: any) => Promise<Response<any, Record<string, any>>>;
+import { NextFunction, Request, Response } from "express";
+declare const _default: (err: unknown, req: Request, res: Response, next: NextFunction) => void;
 export default _default;
 //# sourceMappingURL=error-middleware.d.ts.map

package/dist/middleware/error-middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCAQV,OAAO,OAAO,QAAQ;AAAtD,wBA0BE"}
+{"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;8BAOnC,OAAO,OAAO,OAAO,OAAO,QAAQ,QAAQ,YAAY;AAA7E,wBA2BE"}

package/dist/middleware/error-middleware.js

@@ -1,13 +1,4 @@
 "use strict";
-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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,29 +8,32 @@ const constants_1 = require("../constants");
 const render_response_template_1 = require("../utils/render-response-template");
 const client_error_generator_1 = __importDefault(require("../classes/client-error-generator"));
 const index_1 = require("../index");
-exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        // Получаем заголовок Accept
-        const acceptHeader = req.get('Accept');
-        const clientError = client_error_generator_1.default.apply(err);
-        if (err instanceof index_1.CoreError)
-            use_logger_1.Logger.error('Error-middleware: %o', err);
-        else
-            use_logger_1.Logger.error(String(err));
-        const isHtmlRequest = acceptHeader && acceptHeader.includes('text/html');
-        if (isHtmlRequest) {
-            return (0, render_response_template_1.renderResponseTemplate)(res, 'error', {
-                title: "Something's broken, try again later",
+exports.default = (err, req, res, next) => {
+    var _a;
+    const clientError = client_error_generator_1.default.apply(err);
+    const loggerError = err instanceof index_1.CoreError ? err : new Error(String(err));
+    use_logger_1.Logger.error('Error-middleware: %o', loggerError);
+    res
+        .status((_a = clientError.statusCode) !== null && _a !== void 0 ? _a : 500)
+        .format({
+        'text/html': () => {
+            (0, render_response_template_1.renderResponseTemplate)(res, 'error', {
+                title: clientError.message,
                 pageTitle: "Try again later",
-                message: clientError.message,
+                message: String(clientError.details),
                 traceId: clientError.traceId
             });
+        },
+        'application/json': () => {
+            res.json({
+                message: clientError.message,
+                details: clientError.details,
+                traceId: clientError.traceId,
+            });
+        },
+        'default': () => {
+            res.type('text/plain').send(constants_1.DEFAULT_ERROR_MESSAGE);
         }
-        return res.status(clientError.statusCode || 500).json(clientError);
-    }
-    catch (e) {
-        res.status(500);
-        res.send(constants_1.DEFAULT_ERROR_MESSAGE);
-    }
-});
+    });
+};
 //# sourceMappingURL=error-middleware.js.map

package/dist/middleware/error-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,qDAA4C;AAC5C,4CAAmD;AACnD,gFAAyE;AACzE,+FAAqE;AACrE,oCAAmC;AAGnC,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAC/D,IAAI,CAAC;QACJ,4BAA4B;QAC5B,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,gCAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEpD,IAAI,GAAG,YAAY,iBAAS;YAAE,mBAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;;YACnE,mBAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;QAE9B,MAAM,aAAa,GAAG,YAAY,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAEzE,IAAI,aAAa,EAAE,CAAC;YACnB,OAAO,IAAA,iDAAsB,EAAC,GAAG,EAAE,OAAO,EAAE;gBAC3C,KAAK,EAAE,qCAAqC;gBAC5C,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;aAC5B,CAAC,CAAA;QACH,CAAC;QAED,OAAO,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEpE,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"}
+{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;AACA,qDAA4C;AAC5C,4CAAmD;AACnD,gFAAyE;AACzE,+FAAqE;AACrE,oCAAmC;AAEnC,kBAAe,CAAC,GAAY,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;;IAChF,MAAM,WAAW,GAAG,gCAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,GAAG,YAAY,iBAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5E,mBAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;IAElD,GAAG;SACF,MAAM,CAAC,MAAA,WAAW,CAAC,UAAU,mCAAI,GAAG,CAAC;SACrC,MAAM,CAAC;QACP,WAAW,EAAE,GAAG,EAAE;YACjB,IAAA,iDAAsB,EAAC,GAAG,EAAE,OAAO,EAAE;gBACpC,KAAK,EAAE,WAAW,CAAC,OAAO;gBAC1B,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;gBACpC,OAAO,EAAE,WAAW,CAAC,OAAO;aAC5B,CAAC,CAAA;QACH,CAAC;QACD,kBAAkB,EAAE,GAAG,EAAE;YACxB,GAAG,CAAC,IAAI,CAAC;gBACR,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;aAC5B,CAAC,CAAC;QACJ,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACf,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,iCAAqB,CAAC,CAAC;QACpD,CAAC;KACD,CAAC,CAAA;AACH,CAAC,CAAC"}

package/dist/socket/connect-socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AAkB/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,QA2IzE;AAkBD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG"}
+{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AAkB/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,QA4IzE;AAkBD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG"}

package/dist/socket/connect-socket.js

@@ -89,7 +89,7 @@ function connectSocket(webServer, extendConfig) {
                      */
                     const execute = (event, data) => socketServer.handlers[event](options, data, Object.assign({ emit, execute }, extendConfig));
                     const sendResult = wrapResponse(ws, info.requestId, info.event);
-                    use_logger_1.Logger.info('UserId:%d RequestId:%d Event: %s event was received(+)', userId, info.requestId, info.event);
+                    use_logger_1.Logger.info('UserId:%d RequestId:%d Event: %s event was received %o', userId, info.requestId, info.event, info.data);
                     // If handler for current event has been found.
                     if (socketServer.handlers[info.event])
                         sendResult(yield socketServer.handlers[info.event](options, info.data, Object.assign({ emit, execute }, extendConfig)));

package/dist/socket/connect-socket.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}

package/dist/utils/nodeFetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeFetch.d.ts","sourceRoot":"","sources":["../../src/utils/nodeFetch.ts"],"names":[],"mappings":";AAKA,wBAYC"}
+{"version":3,"file":"nodeFetch.d.ts","sourceRoot":"","sources":["../../src/utils/nodeFetch.ts"],"names":[],"mappings":";AAKA,wBAeC"}

package/dist/utils/nodeFetch.js

@@ -46,9 +46,10 @@ exports.default = (url, init) => __awaiter(void 0, void 0, void 0, function* ()
     }
     catch (err) {
         use_logger_1.Logger.error(err);
+        throw app_server_error_1.default.NetworkError();
     }
     if (!(response === null || response === void 0 ? void 0 : response.ok))
-        return parseAppServerError(response);
+        yield parseAppServerError(response);
     return response;
 });
 /**
@@ -61,26 +62,29 @@ function parseAppServerError(res) {
             throw app_server_error_1.default.InvalidResponse();
         const status = res.status;
         const statusText = res.statusText;
-        const contentType = res.headers.get('content-type');
-        use_logger_1.Logger.info("Request error %s %d %s %s", res.url, status, statusText, contentType);
-        if (!contentType)
-            throw app_server_error_1.default.InvalidContentType();
+        const contentType = res.headers.get('content-type') || "";
+        use_logger_1.Logger.info("Request error: %s [%d %s] content-type %s", res.url, status, statusText, contentType);
         /**
          * Any application/json data
          */
         if (/application\/\D*json/.test(contentType)) {
-            use_logger_1.Logger.debug('Application/json was founded: %s', contentType);
-            const data = yield res.json();
-            const details = typeof (data === null || data === void 0 ? void 0 : data.detail) === 'string' ? data.detail : "";
-            const message = (data === null || data === void 0 ? void 0 : data.message) || (data === null || data === void 0 ? void 0 : data.title) || (data === null || data === void 0 ? void 0 : data.label) || (data === null || data === void 0 ? void 0 : data.ErrorMessage) || (data === null || data === void 0 ? void 0 : data.Message) || (data === null || data === void 0 ? void 0 : data.Title) || (data === null || data === void 0 ? void 0 : data.Label);
+            let data;
+            try {
+                data = yield res.json();
+            }
+            catch (e) {
+                throw app_server_error_1.default.ParseError("Invalid JSON in error response", e);
+            }
+            const message = data.message || data.title || data.error || (data === null || data === void 0 ? void 0 : data.label) || data.ErrorMessage || data.Message || data.Title || data.Label || 'Unknown error';
+            const details = data.detail || data.errors || data.details || data.Details || [];
             throw app_server_error_1.default.FailedRequest(message, details, status);
         }
         /**
          * Just text error
          */
         if (contentType.includes("text/plain")) {
-            const data = yield res.text();
-            throw app_server_error_1.default.FailedRequest(data, [], status);
+            const text = yield res.text();
+            throw app_server_error_1.default.FailedRequest(text, [], status);
         }
         throw app_server_error_1.default.UnknownContentType(contentType);
     });

package/dist/utils/nodeFetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodeFetch.js","sourceRoot":"","sources":["../../src/utils/nodeFetch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nodeFetch.js","sourceRoot":"","sources":["../../src/utils/nodeFetch.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eservices-back-core",
-  "version": "2.1.107",
+  "version": "2.1.109",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/readme.md

@@ -1,2 +1,11 @@
 To test-run web-server use:
 #### `npm start`
+
+
+### Ошибки в AppServer
+
+Должна возвращать Entity access denied, sorry
+`http://localhost:3000/close-api/data/ApplicationStationFrequency?fields=ApplicationStation1`
+
+Стандартная заглушка/ошибка
+`http://localhost:3000/close-api/data/ApplicationStationFrequenc`