eservices-back-core 2.0.20 → 2.0.22
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/errors/core-error.d.ts.map +1 -1
- package/dist/errors/core-error.js +2 -0
- package/dist/errors/core-error.js.map +1 -1
- package/dist/socket/connect-socket.js +2 -0
- package/dist/socket/connect-socket.js.map +1 -1
- package/dist/types/server-type.d.ts +7 -0
- package/dist/types/server-type.d.ts.map +1 -1
- package/dist/utils/get-usage-context.d.ts.map +1 -1
- package/dist/utils/get-usage-context.js +3 -12
- package/dist/utils/get-usage-context.js.map +1 -1
- package/package.json +1 -1
|
@@ -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;IAE3C;;;;;OAKG;gBACS,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO;
|
|
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;IAgBzD,cAAc,EAAE,MAAM,CAAA;IACtB;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM;IAItC;;;;OAIG;IACH,MAAM,CAAC,kCAAkC,CAAC,GAAG,CAAC,EAAE,MAAM;CAGtD"}
|
|
@@ -17,6 +17,8 @@ class CoreError extends Error {
|
|
|
17
17
|
if (typeof insideError === 'string') {
|
|
18
18
|
this.message = insideError;
|
|
19
19
|
}
|
|
20
|
+
if (!this.message)
|
|
21
|
+
this.message = this.displayMessage;
|
|
20
22
|
}
|
|
21
23
|
/**
|
|
22
24
|
* @description Ошибка связана с получением информации о пользователе по его externalId. Одна из причин является
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;QAED,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC;IACvD,CAAC;IAGD;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAkB;QACrC,OAAO,IAAI,SAAS,CAAC,4CAA4C,UAAU,EAAE,CAAC,CAAC;IAChF,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kCAAkC,CAAC,GAAY;QACrD,OAAO,IAAI,SAAS,CAAC,2CAA2C,GAAG,iCAAiC,CAAC,CAAA;IACtG,CAAC;CACD;AAzCD,4BAyCC"}
|
|
@@ -191,6 +191,8 @@ function sendWSError(ws, response, requestId = 0) {
|
|
|
191
191
|
const data = {};
|
|
192
192
|
if (typeof (response === null || response === void 0 ? void 0 : response.message) === 'string')
|
|
193
193
|
data.message = response.message;
|
|
194
|
+
if (typeof (response === null || response === void 0 ? void 0 : response.displayMessage) === 'string')
|
|
195
|
+
data.message = response.displayMessage;
|
|
194
196
|
if (typeof (response === null || response === void 0 ? void 0 : response.details) === 'string')
|
|
195
197
|
response.details = [response.details];
|
|
196
198
|
if (Array.isArray(response.details))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,6 +49,13 @@ export interface IServerParams {
|
|
|
49
49
|
* @description Параметры, для работы с сессией. Полностью передаются в express-session.
|
|
50
50
|
*/
|
|
51
51
|
session: IServerSession;
|
|
52
|
+
/**
|
|
53
|
+
* @description Функция предназначена для определения usage-context, в СЛУЧАЕ если его не получилось определить
|
|
54
|
+
* из файла конфигурации usage-context.json
|
|
55
|
+
* @param path {string} путь, с которого запрашивается usage-context. Он также уже прошёл через начальную обработку
|
|
56
|
+
* в ядре (удаление начального / и решение frontendBase)
|
|
57
|
+
*/
|
|
58
|
+
handleResolveUsageContext?: (path: string) => string | null;
|
|
52
59
|
}
|
|
53
60
|
export type ServerType = 'back' | 'front';
|
|
54
61
|
export interface IServerSession {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-type.d.ts","sourceRoot":"","sources":["../../src/types/server-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,aAAa;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;IAEnB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;IAEpB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"server-type.d.ts","sourceRoot":"","sources":["../../src/types/server-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,aAAa;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;IAEnB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;IAEpB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IAExB;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;CAC5D;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA;AAEzC,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC9B;AAED,MAAM,WAAW,yBAAyB;IACzC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1C,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAClC,eAAe,EAAE;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KACnB,EAAE,CAAA;CACH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-usage-context.d.ts","sourceRoot":"","sources":["../../src/utils/get-usage-context.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"get-usage-context.d.ts","sourceRoot":"","sources":["../../src/utils/get-usage-context.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,KAAK,EAAE,MAAM,UAmCpD"}
|
|
@@ -27,21 +27,12 @@ function getUsageContext(refer) {
|
|
|
27
27
|
if (path.startsWith(frontendBase))
|
|
28
28
|
path = path.slice(frontendBase.length);
|
|
29
29
|
}
|
|
30
|
-
// OLD ++++
|
|
31
|
-
const typeBack = '/back-main';
|
|
32
|
-
if (path.startsWith(typeBack))
|
|
33
|
-
path = path.slice(typeBack.length + 1);
|
|
34
|
-
const typeFront = '/front-main';
|
|
35
|
-
if (path.startsWith(typeFront))
|
|
36
|
-
path = path.slice(typeFront.length + 1);
|
|
37
|
-
const defaultType = '/main';
|
|
38
|
-
if (path.startsWith(defaultType))
|
|
39
|
-
path = path.slice(defaultType.length + 1);
|
|
40
30
|
if (path.startsWith('/') && path.length > 1)
|
|
41
31
|
path = path.slice(1);
|
|
42
|
-
// ++++++++
|
|
43
32
|
debug('Result path %s', path);
|
|
44
|
-
|
|
33
|
+
let result = usage_context_bind_store_1.default.findContextByURL(path);
|
|
34
|
+
if (!result && Server_1.default.instance.params.handleResolveUsageContext)
|
|
35
|
+
result = Server_1.default.instance.params.handleResolveUsageContext(path);
|
|
45
36
|
if (!result)
|
|
46
37
|
throw api_error_1.default.UsageContextNotFounded(refer);
|
|
47
38
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-usage-context.js","sourceRoot":"","sources":["../../src/utils/get-usage-context.ts"],"names":[],"mappings":";;;;;AAAA,sEAA8C;AAC9C,iGAAsE;AACtE,kEAAyC;AACzC,uDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,sBAAW,EAAC,mBAAmB,CAAC,CAAC;AAC/C;;GAEG;AACH,SAAwB,eAAe,CAAC,KAAa;IAEjD,SAAS,UAAU,CAAC,KAAa;QAC7B,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAEpE,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QACxB,CAAC;QAAC,WAAM,CAAC,CAAA,CAAC;QAEV,MAAM,YAAY,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC;QACzD,IAAI,YAAY,EAAE,CAAC;YACf,KAAK,CAAC,8CAA8C,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;YAC1E,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;gBAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC9E,CAAC;
|
|
1
|
+
{"version":3,"file":"get-usage-context.js","sourceRoot":"","sources":["../../src/utils/get-usage-context.ts"],"names":[],"mappings":";;;;;AAAA,sEAA8C;AAC9C,iGAAsE;AACtE,kEAAyC;AACzC,uDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,sBAAW,EAAC,mBAAmB,CAAC,CAAC;AAC/C;;GAEG;AACH,SAAwB,eAAe,CAAC,KAAa;IAEjD,SAAS,UAAU,CAAC,KAAa;QAC7B,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAEpE,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QACxB,CAAC;QAAC,WAAM,CAAC,CAAA,CAAC;QAEV,MAAM,YAAY,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC;QACzD,IAAI,YAAY,EAAE,CAAC;YACf,KAAK,CAAC,8CAA8C,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;YAC1E,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;gBAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAEjE,KAAK,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAE9B,IAAI,MAAM,GAAG,kCAAqB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAE1D,IAAI,CAAC,MAAM,IAAI,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,yBAAyB;YAAE,MAAM,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAEjI,IAAI,CAAC,MAAM;YAAE,MAAM,mBAAS,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAE3D,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,IAAI,CAAC;QACD,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;AAEL,CAAC;AAnCD,kCAmCC"}
|