eservices-back-core 2.1.108 → 2.1.110
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.
- package/dist/classes/client-error-generator.d.ts +2 -2
- package/dist/classes/client-error-generator.d.ts.map +1 -1
- package/dist/classes/client-error-generator.js +11 -7
- package/dist/classes/client-error-generator.js.map +1 -1
- package/dist/errors/app-server-error.d.ts +2 -0
- package/dist/errors/app-server-error.d.ts.map +1 -1
- package/dist/errors/app-server-error.js +9 -1
- package/dist/errors/app-server-error.js.map +1 -1
- package/dist/middleware/error-middleware.d.ts +2 -2
- package/dist/middleware/error-middleware.d.ts.map +1 -1
- package/dist/middleware/error-middleware.js +24 -30
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/services/list-setting-service.js +1 -1
- package/dist/services/list-setting-service.js.map +1 -1
- package/dist/socket/events/configuration_read.d.ts +2 -0
- package/dist/socket/events/configuration_read.d.ts.map +1 -1
- package/dist/socket/events/configuration_read.js +1 -1
- package/dist/socket/events/configuration_read.js.map +1 -1
- package/dist/utils/nodeFetch.d.ts.map +1 -1
- package/dist/utils/nodeFetch.js +15 -11
- package/dist/utils/nodeFetch.js.map +1 -1
- package/package.json +1 -1
- package/readme.md +9 -0
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export default class ClientErrorGenerator {
|
|
5
5
|
message: string;
|
|
6
|
-
traceId
|
|
6
|
+
traceId?: string;
|
|
7
7
|
statusCode?: number;
|
|
8
|
-
details
|
|
8
|
+
details?: unknown;
|
|
9
9
|
constructor(params: IClientErrorParams);
|
|
10
10
|
static apply(error: unknown): ClientErrorGenerator;
|
|
11
11
|
private static parseCoreError;
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -15,35 +15,39 @@ class ClientErrorGenerator {
|
|
|
15
15
|
this.message = params.message;
|
|
16
16
|
this.traceId = params.traceId;
|
|
17
17
|
this.statusCode = params.statusCode;
|
|
18
|
-
|
|
18
|
+
this.details = params.details || [];
|
|
19
19
|
}
|
|
20
20
|
static apply(error) {
|
|
21
21
|
if (error instanceof app_server_error_1.default) {
|
|
22
|
+
// Для 4xx сохраняем переданные детали, но оставляем стандартное сообщение
|
|
23
|
+
const clientError = ClientErrorGenerator.parseCoreError(error);
|
|
24
|
+
clientError.statusCode = error.status;
|
|
22
25
|
if (error.status >= 400 && error.status < 500) {
|
|
23
|
-
const clientError = ClientErrorGenerator.parseCoreError(error);
|
|
24
26
|
clientError.statusCode = error.status;
|
|
25
27
|
clientError.details = error.details;
|
|
26
28
|
clientError.message = error.message;
|
|
27
|
-
return clientError;
|
|
28
29
|
}
|
|
29
|
-
return
|
|
30
|
+
return clientError;
|
|
30
31
|
}
|
|
31
32
|
if (error instanceof api_error_1.default) {
|
|
32
33
|
const clientError = ClientErrorGenerator.parseCoreError(error);
|
|
33
34
|
clientError.statusCode = error.statusCode;
|
|
34
35
|
return clientError;
|
|
35
36
|
}
|
|
36
|
-
if (error instanceof core_error_1.default)
|
|
37
|
+
if (error instanceof core_error_1.default) {
|
|
37
38
|
return ClientErrorGenerator.parseCoreError(error);
|
|
39
|
+
}
|
|
40
|
+
// Неизвестный тип ошибки
|
|
38
41
|
return new ClientErrorGenerator({
|
|
39
|
-
message: constants_1.DEFAULT_ERROR_MESSAGE
|
|
42
|
+
message: constants_1.DEFAULT_ERROR_MESSAGE,
|
|
43
|
+
traceId: 'unknown'
|
|
40
44
|
});
|
|
41
45
|
}
|
|
42
46
|
static parseCoreError(error) {
|
|
43
47
|
return new ClientErrorGenerator({
|
|
44
48
|
message: constants_1.DEFAULT_ERROR_MESSAGE,
|
|
45
49
|
traceId: error.traceId,
|
|
46
|
-
details: error.details
|
|
50
|
+
// details: error.details
|
|
47
51
|
});
|
|
48
52
|
}
|
|
49
53
|
}
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -30,5 +30,7 @@ export default class AppServerError extends CoreError {
|
|
|
30
30
|
* @constructor
|
|
31
31
|
*/
|
|
32
32
|
static FailedRequest(appServerError: string, details: unknown, status: number): AppServerError;
|
|
33
|
+
static NetworkError(): AppServerError;
|
|
34
|
+
static ParseError(message: string, error: any): AppServerError;
|
|
33
35
|
}
|
|
34
36
|
//# sourceMappingURL=app-server-error.d.ts.map
|
|
@@ -1 +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;
|
|
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;IAM7E,MAAM,CAAC,YAAY;IAGnB,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;CAG7C"}
|
|
@@ -40,7 +40,15 @@ class AppServerError extends core_error_1.default {
|
|
|
40
40
|
* @constructor
|
|
41
41
|
*/
|
|
42
42
|
static FailedRequest(appServerError, details, status) {
|
|
43
|
-
return new AppServerError(appServerError, [details
|
|
43
|
+
return new AppServerError(appServerError, [details], status);
|
|
44
|
+
// Догадывайтесь теперь сами, что произошло.
|
|
45
|
+
//return new AppServerError(appServerError, [details, "AppServer successfully processed the request, but returned an error."], status)
|
|
46
|
+
}
|
|
47
|
+
static NetworkError() {
|
|
48
|
+
return new AppServerError("Network Error", ["The request to app-server failed. No response was received. Check the configuration and network status."], 500);
|
|
49
|
+
}
|
|
50
|
+
static ParseError(message, error) {
|
|
51
|
+
return new AppServerError(message, [error], 500);
|
|
44
52
|
}
|
|
45
53
|
}
|
|
46
54
|
exports.default = AppServerError;
|
|
@@ -1 +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,
|
|
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,CAAC,EAAE,MAAM,CAAC,CAAA;QAC5D,4CAA4C;QAC5C,sIAAsI;IACvI,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;AAtDD,iCAsDC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Request, Response } from "express";
|
|
2
|
-
declare const _default: (err:
|
|
1
|
+
import { NextFunction, Request, Response } from "express";
|
|
2
|
+
declare const _default: (err: unknown, req: Request, res: Response, next: NextFunction) => void;
|
|
3
3
|
export default _default;
|
|
4
4
|
//# sourceMappingURL=error-middleware.d.ts.map
|
|
@@ -1 +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;
|
|
1
|
+
{"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -17,29 +8,32 @@ const constants_1 = require("../constants");
|
|
|
17
8
|
const render_response_template_1 = require("../utils/render-response-template");
|
|
18
9
|
const client_error_generator_1 = __importDefault(require("../classes/client-error-generator"));
|
|
19
10
|
const index_1 = require("../index");
|
|
20
|
-
exports.default = (err, req, res, next) =>
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
return (0, render_response_template_1.renderResponseTemplate)(res, 'error', {
|
|
32
|
-
title: "Something's broken, try again later",
|
|
11
|
+
exports.default = (err, req, res, next) => {
|
|
12
|
+
var _a;
|
|
13
|
+
const clientError = client_error_generator_1.default.apply(err);
|
|
14
|
+
const loggerError = err instanceof index_1.CoreError ? err : new Error(String(err));
|
|
15
|
+
use_logger_1.Logger.error('Error-middleware: %o', loggerError);
|
|
16
|
+
res
|
|
17
|
+
.status((_a = clientError.statusCode) !== null && _a !== void 0 ? _a : 500)
|
|
18
|
+
.format({
|
|
19
|
+
'text/html': () => {
|
|
20
|
+
(0, render_response_template_1.renderResponseTemplate)(res, 'error', {
|
|
21
|
+
title: clientError.message,
|
|
33
22
|
pageTitle: "Try again later",
|
|
34
|
-
message: clientError.
|
|
23
|
+
message: String(clientError.details),
|
|
35
24
|
traceId: clientError.traceId
|
|
36
25
|
});
|
|
26
|
+
},
|
|
27
|
+
'application/json': () => {
|
|
28
|
+
res.json({
|
|
29
|
+
message: clientError.message,
|
|
30
|
+
details: clientError.details,
|
|
31
|
+
traceId: clientError.traceId,
|
|
32
|
+
});
|
|
33
|
+
},
|
|
34
|
+
'default': () => {
|
|
35
|
+
res.type('text/plain').send(constants_1.DEFAULT_ERROR_MESSAGE);
|
|
37
36
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
catch (e) {
|
|
41
|
-
res.status(500);
|
|
42
|
-
res.send(constants_1.DEFAULT_ERROR_MESSAGE);
|
|
43
|
-
}
|
|
44
|
-
});
|
|
37
|
+
});
|
|
38
|
+
};
|
|
45
39
|
//# sourceMappingURL=error-middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"
|
|
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;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"}
|
|
@@ -131,7 +131,7 @@ class ListSettingService {
|
|
|
131
131
|
return null;
|
|
132
132
|
}
|
|
133
133
|
}).filter(item => !!item);
|
|
134
|
-
if (parsedConfig.find(item => item.type === "select" || item.type === "multi-select")) {
|
|
134
|
+
if (parsedConfig.find(item => item.type === "select" || item.type === "multi-select" || item.type === "history")) {
|
|
135
135
|
const metadata = metadata_store_1.default.get(entity);
|
|
136
136
|
parsedConfig.push({
|
|
137
137
|
name: metadata.fieldNameForIdentification,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-setting-service.js","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"list-setting-service.js","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,5 +17,7 @@ export declare function readConfiguration(): Promise<{
|
|
|
17
17
|
dateTimeFormat: string;
|
|
18
18
|
linkedEntities: string[];
|
|
19
19
|
displayBackOfficeUserName: string;
|
|
20
|
+
webServerType: import("../../types/server-type").ServerType;
|
|
21
|
+
webServerName: string;
|
|
20
22
|
}>;
|
|
21
23
|
//# sourceMappingURL=configuration_read.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/configuration_read.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,wBAAsB,iBAAiB
|
|
1
|
+
{"version":3,"file":"configuration_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/configuration_read.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,wBAAsB,iBAAiB;;;;;;;;;;;;;;;;;;GAEtC"}
|
|
@@ -30,7 +30,7 @@ function getServerConfiguration() {
|
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
31
|
const versionService = new version_service_1.default();
|
|
32
32
|
const appServerVersionInformation = yield versionService.getVersion().catch(() => ({ version: "-" }));
|
|
33
|
-
return Object.assign(Object.assign({}, Server_1.default.instance.configuration), { version: Server_1.default.getServer().version + "," + appServerVersionInformation.version, printForms: print_form_store_1.default.get(), entityInheritanceChain: Object.fromEntries(metadata_store_1.default.getAll().map(metadata => [metadata.name, metadata.baseEntity])) });
|
|
33
|
+
return Object.assign(Object.assign({ webServerType: Server_1.default.instance.type, webServerName: Server_1.default.instance.name }, Server_1.default.instance.configuration), { version: Server_1.default.getServer().version + "," + appServerVersionInformation.version, printForms: print_form_store_1.default.get(), entityInheritanceChain: Object.fromEntries(metadata_store_1.default.getAll().map(metadata => [metadata.name, metadata.baseEntity])) });
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
//# sourceMappingURL=configuration_read.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration_read.js","sourceRoot":"","sources":["../../../src/socket/events/configuration_read.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,gFAAuD;AACvD,oFAA0D;AAC1D,qFAA4D;AAE5D;;GAEG;AACH,SAAsB,iBAAiB;;QACtC,OAAO,sBAAsB,EAAE,CAAC;IACjC,CAAC;CAAA;AAFD,8CAEC;AAED,SAAe,sBAAsB;;QAEpC,MAAM,cAAc,GAAG,IAAI,yBAAc,EAAE,CAAC;QAC5C,MAAM,2BAA2B,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,OAAO,EAAE,GAAG,EAAC,CAAC,CAAC,CAAC;QAEpG,
|
|
1
|
+
{"version":3,"file":"configuration_read.js","sourceRoot":"","sources":["../../../src/socket/events/configuration_read.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,gFAAuD;AACvD,oFAA0D;AAC1D,qFAA4D;AAE5D;;GAEG;AACH,SAAsB,iBAAiB;;QACtC,OAAO,sBAAsB,EAAE,CAAC;IACjC,CAAC;CAAA;AAFD,8CAEC;AAED,SAAe,sBAAsB;;QAEpC,MAAM,cAAc,GAAG,IAAI,yBAAc,EAAE,CAAC;QAC5C,MAAM,2BAA2B,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,OAAO,EAAE,GAAG,EAAC,CAAC,CAAC,CAAC;QAEpG,qCACC,aAAa,EAAE,gBAAM,CAAC,QAAQ,CAAC,IAAI,EACnC,aAAa,EAAE,gBAAM,CAAC,QAAQ,CAAC,IAAI,IAChC,gBAAM,CAAC,QAAQ,CAAC,aAAa,KAChC,OAAO,EAAE,gBAAM,CAAC,SAAS,EAAE,CAAC,OAAO,GAAG,GAAG,GAAG,2BAA2B,CAAC,OAAO,EAC/E,UAAU,EAAE,0BAAc,CAAC,GAAG,EAAE,EAChC,sBAAsB,EAAE,MAAM,CAAC,WAAW,CAAC,wBAAa,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IACxH;IACF,CAAC;CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeFetch.d.ts","sourceRoot":"","sources":["../../src/utils/nodeFetch.ts"],"names":[],"mappings":";AAKA,
|
|
1
|
+
{"version":3,"file":"nodeFetch.d.ts","sourceRoot":"","sources":["../../src/utils/nodeFetch.ts"],"names":[],"mappings":";AAKA,wBAeC"}
|
package/dist/utils/nodeFetch.js
CHANGED
|
@@ -46,9 +46,10 @@ exports.default = (url, init) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
46
46
|
}
|
|
47
47
|
catch (err) {
|
|
48
48
|
use_logger_1.Logger.error(err);
|
|
49
|
+
throw app_server_error_1.default.NetworkError();
|
|
49
50
|
}
|
|
50
51
|
if (!(response === null || response === void 0 ? void 0 : response.ok))
|
|
51
|
-
|
|
52
|
+
yield parseAppServerError(response);
|
|
52
53
|
return response;
|
|
53
54
|
});
|
|
54
55
|
/**
|
|
@@ -61,26 +62,29 @@ function parseAppServerError(res) {
|
|
|
61
62
|
throw app_server_error_1.default.InvalidResponse();
|
|
62
63
|
const status = res.status;
|
|
63
64
|
const statusText = res.statusText;
|
|
64
|
-
const contentType = res.headers.get('content-type');
|
|
65
|
-
use_logger_1.Logger.info("Request error %s %d %s %s", res.url, status, statusText, contentType);
|
|
66
|
-
if (!contentType)
|
|
67
|
-
throw app_server_error_1.default.InvalidContentType();
|
|
65
|
+
const contentType = res.headers.get('content-type') || "";
|
|
66
|
+
use_logger_1.Logger.info("Request error: %s [%d %s] content-type %s", res.url, status, statusText, contentType);
|
|
68
67
|
/**
|
|
69
68
|
* Any application/json data
|
|
70
69
|
*/
|
|
71
70
|
if (/application\/\D*json/.test(contentType)) {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
71
|
+
let data;
|
|
72
|
+
try {
|
|
73
|
+
data = yield res.json();
|
|
74
|
+
}
|
|
75
|
+
catch (e) {
|
|
76
|
+
throw app_server_error_1.default.ParseError("Invalid JSON in error response", e);
|
|
77
|
+
}
|
|
78
|
+
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';
|
|
79
|
+
const details = data.detail || data.errors || data.details || data.Details || [];
|
|
76
80
|
throw app_server_error_1.default.FailedRequest(message, details, status);
|
|
77
81
|
}
|
|
78
82
|
/**
|
|
79
83
|
* Just text error
|
|
80
84
|
*/
|
|
81
85
|
if (contentType.includes("text/plain")) {
|
|
82
|
-
const
|
|
83
|
-
throw app_server_error_1.default.FailedRequest(
|
|
86
|
+
const text = yield res.text();
|
|
87
|
+
throw app_server_error_1.default.FailedRequest(text, [], status);
|
|
84
88
|
}
|
|
85
89
|
throw app_server_error_1.default.UnknownContentType(contentType);
|
|
86
90
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeFetch.js","sourceRoot":"","sources":["../../src/utils/nodeFetch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qDAA4C;AAC5C,kFAAwD;AACxD,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,kDAAO,YAAY,IAAE,IAAI,CAAC,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;AAE9F,kBAAe,CAAO,GAAgB,EAAE,IAAkB,EAAE,EAAE;IAC1D,mBAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,KAAI,EAAE,EAAE,GAAG,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,KAAI,EAAE,CAAC,CAAC;IAEnE,IAAI,QAAQ,CAAC;IACb,IAAI,CAAC;QACD,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC5D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,mBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"nodeFetch.js","sourceRoot":"","sources":["../../src/utils/nodeFetch.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -1,2 +1,11 @@
|
|
|
1
1
|
To test-run web-server use:
|
|
2
2
|
#### `npm start`
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
### Ошибки в AppServer
|
|
6
|
+
|
|
7
|
+
Должна возвращать Entity access denied, sorry
|
|
8
|
+
`http://localhost:3000/close-api/data/ApplicationStationFrequency?fields=ApplicationStation1`
|
|
9
|
+
|
|
10
|
+
Стандартная заглушка/ошибка
|
|
11
|
+
`http://localhost:3000/close-api/data/ApplicationStationFrequenc`
|