eservices-back-core 2.1.140 → 2.1.142
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/Server.js +120 -92
- package/dist/Server.js.map +1 -1
- package/dist/app.js +1 -1
- package/dist/app.js.map +1 -1
- package/dist/auth/async-manager.js +2 -3
- package/dist/auth/async-manager.js.map +1 -1
- package/dist/auth/authorization-client.js +110 -103
- package/dist/auth/authorization-client.js.map +1 -1
- package/dist/classes/client-error-generator.js +4 -0
- package/dist/classes/client-error-generator.js.map +1 -1
- package/dist/constants.js +2 -2
- package/dist/constants.js.map +1 -1
- package/dist/controller/close-api/account-controller.js +20 -33
- package/dist/controller/close-api/account-controller.js.map +1 -1
- package/dist/controller/close-api/billing-controller.js +37 -54
- package/dist/controller/close-api/billing-controller.js.map +1 -1
- package/dist/controller/close-api/data-controller.js +10 -18
- package/dist/controller/close-api/data-controller.js.map +1 -1
- package/dist/controller/close-api/document-builder-controller.js +38 -49
- package/dist/controller/close-api/document-builder-controller.js.map +1 -1
- package/dist/controller/close-api/executors-controller.js +54 -66
- package/dist/controller/close-api/executors-controller.js.map +1 -1
- package/dist/controller/close-api/internationalization-controller.js +8 -19
- package/dist/controller/close-api/internationalization-controller.js.map +1 -1
- package/dist/controller/close-api/metadata-controller.js +33 -48
- package/dist/controller/close-api/metadata-controller.js.map +1 -1
- package/dist/controller/close-api/view-controller.js +21 -35
- package/dist/controller/close-api/view-controller.js.map +1 -1
- package/dist/controller/open-api/data-controller.js +18 -31
- package/dist/controller/open-api/data-controller.js.map +1 -1
- package/dist/dtos/dto-list-setting.js +5 -3
- package/dist/dtos/dto-list-setting.js.map +1 -1
- package/dist/dtos/dto-print-form.js +4 -1
- package/dist/dtos/dto-print-form.js.map +1 -1
- package/dist/errors/api-error.js +5 -0
- package/dist/errors/api-error.js.map +1 -1
- package/dist/errors/app-server-error.js +4 -0
- package/dist/errors/app-server-error.js.map +1 -1
- package/dist/errors/core-error.js +2 -1
- package/dist/errors/core-error.js.map +1 -1
- package/dist/export-data/export-data.service.d.ts.map +1 -1
- package/dist/export-data/export-data.service.js +22 -31
- package/dist/export-data/export-data.service.js.map +1 -1
- package/dist/export-data/export-data.watcher.js +68 -71
- package/dist/export-data/export-data.watcher.js.map +1 -1
- package/dist/logger/use-logger.js +2 -0
- package/dist/logger/use-logger.js.map +1 -1
- package/dist/middleware/error-middleware.js +1 -2
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/middleware/session-middleware.js +4 -1
- package/dist/middleware/session-middleware.js.map +1 -1
- package/dist/middleware/user-middleware.js +3 -12
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/model/Filter.js +10 -10
- package/dist/model/Filter.js.map +1 -1
- package/dist/model/criterion-collector.js +35 -24
- package/dist/model/criterion-collector.js.map +1 -1
- package/dist/model/criterion.js +31 -30
- package/dist/model/criterion.js.map +1 -1
- package/dist/notification/notify.controller.js +2 -0
- package/dist/notification/notify.controller.js.map +1 -1
- package/dist/rabbitmq/connect-rabbit.js +58 -71
- package/dist/rabbitmq/connect-rabbit.js.map +1 -1
- package/dist/router/close/file-route.js +6 -15
- package/dist/router/close/file-route.js.map +1 -1
- package/dist/router/close/test-close-router.js +4 -13
- package/dist/router/close/test-close-router.js.map +1 -1
- package/dist/services/action-service.js +23 -38
- package/dist/services/action-service.js.map +1 -1
- package/dist/services/billing-service.js +1 -4
- package/dist/services/billing-service.js.map +1 -1
- package/dist/services/communication-service.js +17 -23
- package/dist/services/communication-service.js.map +1 -1
- package/dist/services/data-service.js +129 -155
- package/dist/services/data-service.js.map +1 -1
- package/dist/services/history-service.js +13 -3
- package/dist/services/history-service.js.map +1 -1
- package/dist/services/list-setting-service.js +13 -26
- package/dist/services/list-setting-service.js.map +1 -1
- package/dist/services/metadata-service.js +46 -62
- package/dist/services/metadata-service.js.map +1 -1
- package/dist/services/process-wizard-service.js +4 -1
- package/dist/services/process-wizard-service.js.map +1 -1
- package/dist/services/rules-validation-service.js +1 -4
- package/dist/services/rules-validation-service.js.map +1 -1
- package/dist/services/service-with-auth.js +1 -0
- package/dist/services/service-with-auth.js.map +1 -1
- package/dist/services/version-service.js +15 -28
- package/dist/services/version-service.js.map +1 -1
- package/dist/socket/connect-socket.js +54 -65
- package/dist/socket/connect-socket.js.map +1 -1
- package/dist/socket/core-socket-server.js +13 -11
- package/dist/socket/core-socket-server.js.map +1 -1
- package/dist/socket/events/batch_delete.js +17 -28
- package/dist/socket/events/batch_delete.js.map +1 -1
- package/dist/socket/events/batch_update.js +18 -29
- package/dist/socket/events/batch_update.js.map +1 -1
- package/dist/socket/events/client_read.js +21 -32
- package/dist/socket/events/client_read.js.map +1 -1
- package/dist/socket/events/communication-message_create.js +5 -16
- package/dist/socket/events/communication-message_create.js.map +1 -1
- package/dist/socket/events/communication-message_read.js +15 -27
- package/dist/socket/events/communication-message_read.js.map +1 -1
- package/dist/socket/events/communication_create.js +5 -16
- package/dist/socket/events/communication_create.js.map +1 -1
- package/dist/socket/events/communication_read.js +5 -16
- package/dist/socket/events/communication_read.js.map +1 -1
- package/dist/socket/events/configuration_read.js +2 -13
- package/dist/socket/events/configuration_read.js.map +1 -1
- package/dist/socket/events/dashboard_read-licenses.js +5 -16
- package/dist/socket/events/dashboard_read-licenses.js.map +1 -1
- package/dist/socket/events/dev_test-progress.js +16 -27
- package/dist/socket/events/dev_test-progress.js.map +1 -1
- package/dist/socket/events/dictionary_read.js +5 -16
- package/dist/socket/events/dictionary_read.js.map +1 -1
- package/dist/socket/events/entity_count.js +13 -24
- package/dist/socket/events/entity_count.js.map +1 -1
- package/dist/socket/events/entity_create.js +13 -24
- package/dist/socket/events/entity_create.js.map +1 -1
- package/dist/socket/events/entity_delete.js +15 -26
- package/dist/socket/events/entity_delete.js.map +1 -1
- package/dist/socket/events/entity_read.js +46 -55
- package/dist/socket/events/entity_read.js.map +1 -1
- package/dist/socket/events/entity_resolve.js +8 -19
- package/dist/socket/events/entity_resolve.js.map +1 -1
- package/dist/socket/events/entity_update.js +15 -26
- package/dist/socket/events/entity_update.js.map +1 -1
- package/dist/socket/events/enum_read.js +4 -15
- package/dist/socket/events/enum_read.js.map +1 -1
- package/dist/socket/events/export-configuration_read.js +4 -15
- package/dist/socket/events/export-configuration_read.js.map +1 -1
- package/dist/socket/events/export-data.event.js +21 -24
- package/dist/socket/events/export-data.event.js.map +1 -1
- package/dist/socket/events/history_read.js +13 -24
- package/dist/socket/events/history_read.js.map +1 -1
- package/dist/socket/events/interface_navigation.js +57 -64
- package/dist/socket/events/interface_navigation.js.map +1 -1
- package/dist/socket/events/interface_notification.js +9 -20
- package/dist/socket/events/interface_notification.js.map +1 -1
- package/dist/socket/events/list-setting_fix.js +3 -14
- package/dist/socket/events/list-setting_fix.js.map +1 -1
- package/dist/socket/events/list-setting_read.js +10 -21
- package/dist/socket/events/list-setting_read.js.map +1 -1
- package/dist/socket/events/metadata-field_treat.js +6 -17
- package/dist/socket/events/metadata-field_treat.js.map +1 -1
- package/dist/socket/events/tool_execute.js +30 -41
- package/dist/socket/events/tool_execute.js.map +1 -1
- package/dist/socket/events/tool_read.js +15 -26
- package/dist/socket/events/tool_read.js.map +1 -1
- package/dist/socket/events/tool_task-parameters.js +10 -21
- package/dist/socket/events/tool_task-parameters.js.map +1 -1
- package/dist/socket/events/usage-context_read-mandatory-fields.js +15 -26
- package/dist/socket/events/usage-context_read-mandatory-fields.js.map +1 -1
- package/dist/socket/events/usage-context_read.js +15 -26
- package/dist/socket/events/usage-context_read.js.map +1 -1
- package/dist/socket/events/wizard.js +17 -32
- package/dist/socket/events/wizard.js.map +1 -1
- package/dist/store/customer-configuration-store.js +13 -19
- package/dist/store/customer-configuration-store.js.map +1 -1
- package/dist/store/enum-store.js +6 -17
- package/dist/store/enum-store.js.map +1 -1
- package/dist/store/export-configuration-store.js +1 -3
- package/dist/store/export-configuration-store.js.map +1 -1
- package/dist/store/list-store.js +13 -26
- package/dist/store/list-store.js.map +1 -1
- package/dist/store/message-template.store.d.ts +22 -0
- package/dist/store/message-template.store.d.ts.map +1 -1
- package/dist/store/message-template.store.js +46 -5
- package/dist/store/message-template.store.js.map +1 -1
- package/dist/store/metadata-criterion-store.js +1 -2
- package/dist/store/metadata-criterion-store.js.map +1 -1
- package/dist/store/metadata-store.js +55 -70
- package/dist/store/metadata-store.js.map +1 -1
- package/dist/store/template-store.js +36 -47
- package/dist/store/template-store.js.map +1 -1
- package/dist/utils/Filter.js +1 -2
- package/dist/utils/Filter.js.map +1 -1
- package/dist/utils/generate-custom-filters.js +16 -27
- package/dist/utils/generate-custom-filters.js.map +1 -1
- package/dist/utils/get-criterion-config.js +6 -17
- package/dist/utils/get-criterion-config.js.map +1 -1
- package/dist/utils/get-extend-customer-filters.js +24 -39
- package/dist/utils/get-extend-customer-filters.js.map +1 -1
- package/dist/utils/get-required-attribute-values.js +27 -38
- package/dist/utils/get-required-attribute-values.js.map +1 -1
- package/dist/utils/get-trigger-progress.js +1 -1
- package/dist/utils/get-trigger-progress.js.map +1 -1
- package/dist/utils/get-usage-context.js +1 -1
- package/dist/utils/get-usage-context.js.map +1 -1
- package/dist/utils/iterate-entity-value-with-hooks.js +64 -77
- package/dist/utils/iterate-entity-value-with-hooks.js.map +1 -1
- package/dist/utils/load-customer-info-by-external.js +20 -31
- package/dist/utils/load-customer-info-by-external.js.map +1 -1
- package/dist/utils/nodeFetch.js +34 -45
- package/dist/utils/nodeFetch.js.map +1 -1
- package/dist/utils/parse-custom-required-attribute-values.js +18 -29
- package/dist/utils/parse-custom-required-attribute-values.js.map +1 -1
- package/dist/utils/translate.js +1 -2
- package/dist/utils/translate.js.map +1 -1
- package/dist/utils/use-config.js +24 -37
- package/dist/utils/use-config.js.map +1 -1
- package/dist/utils/value-hooks.js +2 -3
- package/dist/utils/value-hooks.js.map +1 -1
- package/package.json +1 -1
- package/tsconfig.json +1 -1
|
@@ -10,17 +10,50 @@ const index_1 = require("../index");
|
|
|
10
10
|
* @description Класс используется для хранения набора executors для дальнейшего построения criterion.
|
|
11
11
|
*/
|
|
12
12
|
class CriterionCollector {
|
|
13
|
+
/**
|
|
14
|
+
* @description Используется для соединения групп.
|
|
15
|
+
* @example StatusCode=P&TypeCode=S -> [StatusCode=P][TypeCode=S]
|
|
16
|
+
*/
|
|
17
|
+
static SYMBOL_GROUP_SPLITTER = '&';
|
|
18
|
+
/**
|
|
19
|
+
* @description Используется для соединения подгруппы.
|
|
20
|
+
* @example StatusCode=P+Name=Jenesius -> [StatusCode=P + Name=Jenesius]
|
|
21
|
+
*/
|
|
22
|
+
static SYMBOL_LOCAL_SPLITTER = '+';
|
|
23
|
+
/**
|
|
24
|
+
* @description Набор сущностей, которые используются для вычисления критериев.
|
|
25
|
+
*/
|
|
26
|
+
entities = new Map();
|
|
27
|
+
/**
|
|
28
|
+
* @description Набор сущностей используемых для проверки на наличие
|
|
29
|
+
*/
|
|
30
|
+
entitiesInclude = new Map();
|
|
31
|
+
/**
|
|
32
|
+
* @description AccessToken пользователя для будущих запросов
|
|
33
|
+
*/
|
|
34
|
+
accessToken;
|
|
35
|
+
/**
|
|
36
|
+
* @description Набор Master сущностей (entity, id)
|
|
37
|
+
*/
|
|
38
|
+
masterEntities;
|
|
39
|
+
/**
|
|
40
|
+
* @description Двумерный массив executors. Первый слов является группами, второй единичными элементами группы.
|
|
41
|
+
*/
|
|
42
|
+
array = [];
|
|
43
|
+
/**
|
|
44
|
+
* @description Предустановленный набор значений. Используется для добавления констант (через @): @CCI
|
|
45
|
+
*/
|
|
46
|
+
preset;
|
|
13
47
|
/**
|
|
14
48
|
* @description Функция используется для коллекционирования(соединения в кучу) всех полей для всех сущностей.
|
|
15
49
|
*/
|
|
16
50
|
collectFields(entity, fields) {
|
|
17
|
-
var _a;
|
|
18
51
|
if (typeof entity !== 'string')
|
|
19
52
|
return;
|
|
20
53
|
if (typeof fields === 'string' && fields.startsWith('@'))
|
|
21
54
|
return;
|
|
22
55
|
if (!this.entities.has(entity)) {
|
|
23
|
-
const id =
|
|
56
|
+
const id = this.masterEntities.find(item => item[0] === entity)?.[1];
|
|
24
57
|
if (!id)
|
|
25
58
|
return;
|
|
26
59
|
this.entities.set(entity, {
|
|
@@ -46,18 +79,6 @@ class CriterionCollector {
|
|
|
46
79
|
}));
|
|
47
80
|
}
|
|
48
81
|
constructor(options) {
|
|
49
|
-
/**
|
|
50
|
-
* @description Набор сущностей, которые используются для вычисления критериев.
|
|
51
|
-
*/
|
|
52
|
-
this.entities = new Map();
|
|
53
|
-
/**
|
|
54
|
-
* @description Набор сущностей используемых для проверки на наличие
|
|
55
|
-
*/
|
|
56
|
-
this.entitiesInclude = new Map();
|
|
57
|
-
/**
|
|
58
|
-
* @description Двумерный массив executors. Первый слов является группами, второй единичными элементами группы.
|
|
59
|
-
*/
|
|
60
|
-
this.array = [];
|
|
61
82
|
this.accessToken = options.accessToken;
|
|
62
83
|
this.masterEntities = options.entities;
|
|
63
84
|
this.preset = options.preset || {};
|
|
@@ -158,14 +179,4 @@ class CriterionCollector {
|
|
|
158
179
|
}
|
|
159
180
|
}
|
|
160
181
|
exports.CriterionCollector = CriterionCollector;
|
|
161
|
-
/**
|
|
162
|
-
* @description Используется для соединения групп.
|
|
163
|
-
* @example StatusCode=P&TypeCode=S -> [StatusCode=P][TypeCode=S]
|
|
164
|
-
*/
|
|
165
|
-
CriterionCollector.SYMBOL_GROUP_SPLITTER = '&';
|
|
166
|
-
/**
|
|
167
|
-
* @description Используется для соединения подгруппы.
|
|
168
|
-
* @example StatusCode=P+Name=Jenesius -> [StatusCode=P + Name=Jenesius]
|
|
169
|
-
*/
|
|
170
|
-
CriterionCollector.SYMBOL_LOCAL_SPLITTER = '+';
|
|
171
182
|
//# sourceMappingURL=criterion-collector.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-collector.js","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAmD;AAEnD,oCAAwC;AAExC;;GAEG;AACH,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"criterion-collector.js","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":"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"}
|
package/dist/model/criterion.js
CHANGED
|
@@ -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
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
/**
|
|
13
4
|
* @description Дай Всемогущий тебе сил для понимания того, что здесь происходит.
|
|
@@ -24,20 +15,32 @@ const criterion_collector_1 = require("./criterion-collector");
|
|
|
24
15
|
const constants_1 = require("../constants");
|
|
25
16
|
const use_logger_1 = require("../logger/use-logger");
|
|
26
17
|
class Criterion {
|
|
18
|
+
/**
|
|
19
|
+
* @description Массив обработанных критериев.
|
|
20
|
+
*/
|
|
21
|
+
array = [];
|
|
22
|
+
/**
|
|
23
|
+
* @description Названия сущности, которая является базовой для текущего критерия
|
|
24
|
+
*/
|
|
25
|
+
primaryEntity;
|
|
26
|
+
primaryId;
|
|
27
|
+
/**
|
|
28
|
+
* @description Набор сущностей с их идентификаторами
|
|
29
|
+
*/
|
|
30
|
+
masterEntities = new Map();
|
|
31
|
+
/**
|
|
32
|
+
* @description Для упрощения работы с критериями был добавлен данный класс Collector. Его суть в том, что мы
|
|
33
|
+
* проходясь по нашей конфигурации, генерируем обратные функции и сохраняем их. Обратная функция - это функция результат
|
|
34
|
+
* которой используется для каждой ячейки критерия. Иными словами проходясь в методе 'collectExtendedInformation' мы
|
|
35
|
+
* собираем такой массив функций. А затем просто вызываем их.
|
|
36
|
+
*/
|
|
37
|
+
collector;
|
|
27
38
|
/**
|
|
28
39
|
* @description Конфигурация принимает массив критериев. Обратите внимание, что Критерии первого уровня, будут соединены
|
|
29
40
|
* друг с другой при помощи символа Criterion.SYMBOL_GROUP_SPLITTER. Критерии второго уровня(относящиеся к одной группе)
|
|
30
41
|
* будет соединены при помощи Criterion.SYMBOL_LOCAL_SPLITTER.
|
|
31
42
|
*/
|
|
32
43
|
constructor(configuration, options) {
|
|
33
|
-
/**
|
|
34
|
-
* @description Массив обработанных критериев.
|
|
35
|
-
*/
|
|
36
|
-
this.array = [];
|
|
37
|
-
/**
|
|
38
|
-
* @description Набор сущностей с их идентификаторами
|
|
39
|
-
*/
|
|
40
|
-
this.masterEntities = new Map();
|
|
41
44
|
this.array = this.parseCriterion(configuration); // Приводим к нормальному виду конфигурацию
|
|
42
45
|
this.primaryEntity = options.primaryEntity;
|
|
43
46
|
this.primaryId = options.primaryId;
|
|
@@ -113,19 +116,17 @@ class Criterion {
|
|
|
113
116
|
/**
|
|
114
117
|
* @description Функция генерирует критерий.
|
|
115
118
|
*/
|
|
116
|
-
generate() {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
return result;
|
|
128
|
-
});
|
|
119
|
+
async generate() {
|
|
120
|
+
await this.collector.load();
|
|
121
|
+
let result = this.collector.generate();
|
|
122
|
+
result = result.trim();
|
|
123
|
+
if (result.length === 0)
|
|
124
|
+
return constants_1.DEFAULT_CRITERION_VALUE;
|
|
125
|
+
if (this.primaryId)
|
|
126
|
+
result += (result.length === 0 ? "" : criterion_collector_1.CriterionCollector.SYMBOL_GROUP_SPLITTER) + `CurrentEntityId=${this.primaryId}`;
|
|
127
|
+
if (this.masterEntities.size)
|
|
128
|
+
result += (result.length === 0 ? "" : criterion_collector_1.CriterionCollector.SYMBOL_GROUP_SPLITTER) + `ParentEntityId=${Array.from(this.masterEntities.values())[0]}`;
|
|
129
|
+
return result;
|
|
129
130
|
}
|
|
130
131
|
static isFieldCriterion(item) {
|
|
131
132
|
return typeof item === 'string';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion.js","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"criterion.js","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NotifyController = void 0;
|
|
4
4
|
class NotifyController {
|
|
5
|
+
messageTemplateStore;
|
|
6
|
+
socketServer;
|
|
5
7
|
constructor(messageTemplateStore, socketServer) {
|
|
6
8
|
this.messageTemplateStore = messageTemplateStore;
|
|
7
9
|
this.socketServer = socketServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notify.controller.js","sourceRoot":"","sources":["../../src/notification/notify.controller.ts"],"names":[],"mappings":";;;AAIA,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"notify.controller.js","sourceRoot":"","sources":["../../src/notification/notify.controller.ts"],"names":[],"mappings":";;;AAIA,MAAa,gBAAgB;IAGV;IACA;IAFlB,YACkB,oBAA0C,EAC1C,YAA8B;QAD9B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,iBAAY,GAAZ,YAAY,CAAkB;IAEhD,CAAC;IAEM,MAAM,CAAC,MAAqB;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAC9C,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,cAAc,CACrB,CAAA;QACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED;;;;OAIG;IACK,aAAa,CAAC,MAAc,EAAE,OAAe;QACpD,IAAI,CAAC,YAAY,CAAC,UAAU,CAC3B,MAAM,EACN,cAAc,EACd;YACC,OAAO;SACP,CACD,CAAA;IACF,CAAC;CACD;AA/BD,4CA+BC"}
|
|
@@ -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
|
};
|
|
@@ -20,71 +11,67 @@ const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
|
20
11
|
* @description Функция используется для подключения к Rabbit. Создание очереди прослушивания сообщений и пересылки
|
|
21
12
|
* сообщений в нужные сокеты.
|
|
22
13
|
*/
|
|
23
|
-
function connectRabbit(server, options) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
return
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if (!ws)
|
|
74
|
-
return;
|
|
75
|
-
(0, connect_socket_1.sendWSResponse)(ws, 'message', { message, subject });
|
|
76
|
-
});
|
|
14
|
+
async function connectRabbit(server, options) {
|
|
15
|
+
let connectionStatus = 'closed';
|
|
16
|
+
let connection;
|
|
17
|
+
const queue = [(options.prefix || "UNKNOWN"), "WS", "Events"].join('.');
|
|
18
|
+
const exchange = options.exchange;
|
|
19
|
+
use_logger_1.Logger.info(`AMQP options %o`, options);
|
|
20
|
+
tryConnection();
|
|
21
|
+
async function startConnection() {
|
|
22
|
+
if (connectionStatus === 'connecting')
|
|
23
|
+
return;
|
|
24
|
+
connectionStatus = 'connecting';
|
|
25
|
+
use_logger_1.Logger.info("Start connection to Rabbit.");
|
|
26
|
+
connection = await amqplib_1.default.connect(options);
|
|
27
|
+
connectionStatus = 'connected';
|
|
28
|
+
use_logger_1.Logger.info("Connection to RabbitMQ was created!", options);
|
|
29
|
+
connection.on('close', handleCloseConnection);
|
|
30
|
+
connection.on('error', handleCloseConnection);
|
|
31
|
+
const channel = await connection.createChannel();
|
|
32
|
+
await channel.assertQueue(queue, { durable: false })
|
|
33
|
+
.then(ok => channel.bindQueue(ok.queue, exchange, ""));
|
|
34
|
+
channel.consume(queue, handleMessage, { noAck: true });
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* @description Функция для подключения к RabbitMQ. В случаи неудачи вызывается переподключение.
|
|
38
|
+
*/
|
|
39
|
+
function tryConnection() {
|
|
40
|
+
setTimeout(() => startConnection().catch(tryConnection), 2000);
|
|
41
|
+
}
|
|
42
|
+
function getPayload(data) {
|
|
43
|
+
if (data.content)
|
|
44
|
+
return JSON.parse(data.content.toString());
|
|
45
|
+
throw new Error("Where is payload in rabbit message?");
|
|
46
|
+
}
|
|
47
|
+
function handleMessage(data) {
|
|
48
|
+
try {
|
|
49
|
+
if (!isMessage(data))
|
|
50
|
+
throw api_error_1.default.RabbitMessageIncorrect(data);
|
|
51
|
+
const payload = getPayload(data);
|
|
52
|
+
if (!isMessagePayload(payload))
|
|
53
|
+
throw api_error_1.default.RabbitMessagePayloadIncorrect(payload);
|
|
54
|
+
const userId = payload.message.userId;
|
|
55
|
+
const message = payload.message.body;
|
|
56
|
+
const subject = payload.message.subject;
|
|
57
|
+
const arrayUsers = Array.isArray(userId) ? userId : [userId];
|
|
58
|
+
arrayUsers.forEach(id => {
|
|
59
|
+
const set = server.socket.getByClientId(typeof id === 'number' ? id : parseInt(id, 10));
|
|
60
|
+
set.forEach(ws => {
|
|
61
|
+
if (!ws)
|
|
62
|
+
return;
|
|
63
|
+
(0, connect_socket_1.sendWSResponse)(ws, 'message', { message, subject });
|
|
77
64
|
});
|
|
78
|
-
}
|
|
79
|
-
catch (e) {
|
|
80
|
-
use_logger_1.Logger.error(e);
|
|
81
|
-
}
|
|
65
|
+
});
|
|
82
66
|
}
|
|
83
|
-
|
|
84
|
-
use_logger_1.Logger.error(
|
|
85
|
-
tryConnection();
|
|
67
|
+
catch (e) {
|
|
68
|
+
use_logger_1.Logger.error(e);
|
|
86
69
|
}
|
|
87
|
-
}
|
|
70
|
+
}
|
|
71
|
+
function handleCloseConnection(err) {
|
|
72
|
+
use_logger_1.Logger.error('Connection was closed or error %s', err?.message);
|
|
73
|
+
tryConnection();
|
|
74
|
+
}
|
|
88
75
|
}
|
|
89
76
|
exports.default = connectRabbit;
|
|
90
77
|
const isMessage = (data) => !!data && typeof data === "object" && ('content' in data || 'message' in data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-rabbit.js","sourceRoot":"","sources":["../../src/rabbitmq/connect-rabbit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connect-rabbit.js","sourceRoot":"","sources":["../../src/rabbitmq/connect-rabbit.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
-
});
|
|
33
|
-
};
|
|
34
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
27
|
};
|
|
@@ -46,7 +37,7 @@ const https = __importStar(require("node:https"));
|
|
|
46
37
|
const render_response_template_1 = require("../../utils/render-response-template");
|
|
47
38
|
const constants_1 = require("../../constants");
|
|
48
39
|
const Router = express_1.default.Router();
|
|
49
|
-
Router.get("/:descriptorId", (req, clientResponse, next) =>
|
|
40
|
+
Router.get("/:descriptorId", async (req, clientResponse, next) => {
|
|
50
41
|
const descriptorId = req.params.descriptorId;
|
|
51
42
|
const url = (0, utils_1.joinURL)(Server_1.default.instance.params.apiUrl, `api/Files`, descriptorId);
|
|
52
43
|
function resolveDefaultErrorPage(response) {
|
|
@@ -85,13 +76,13 @@ Router.get("/:descriptorId", (req, clientResponse, next) => __awaiter(void 0, vo
|
|
|
85
76
|
use_logger_1.Logger.error(e.message);
|
|
86
77
|
resolveDefaultErrorPage(clientResponse);
|
|
87
78
|
});
|
|
88
|
-
})
|
|
89
|
-
Router.post('/', (req, res, next) =>
|
|
79
|
+
});
|
|
80
|
+
Router.post('/', async (req, res, next) => {
|
|
90
81
|
try {
|
|
91
82
|
const formData = new FormData();
|
|
92
83
|
// formidable вернёт массив, где первое значение - объект полей, а второе значение объект,
|
|
93
84
|
// где каждое поле - массив файлов
|
|
94
|
-
const data =
|
|
85
|
+
const data = await (0, formidable_1.default)({}).parse(req);
|
|
95
86
|
const file = data[1].file[0];
|
|
96
87
|
const entityName = data[0].entityName.toString();
|
|
97
88
|
let buffer = fs_1.default.readFileSync(file.filepath);
|
|
@@ -100,7 +91,7 @@ Router.post('/', (req, res, next) => __awaiter(void 0, void 0, void 0, function*
|
|
|
100
91
|
formData.append('file', new File([buffer], file.originalFilename));
|
|
101
92
|
const query = new URLSearchParams({ entityName });
|
|
102
93
|
const url = (0, utils_1.joinURL)(Server_1.default.instance.params.apiUrl, `api/Files?` + query.toString());
|
|
103
|
-
const answer =
|
|
94
|
+
const answer = await (0, nodeFetch_1.default)(url, {
|
|
104
95
|
method: "POST",
|
|
105
96
|
headers: {
|
|
106
97
|
authorization: req.infoAccessToken,
|
|
@@ -113,6 +104,6 @@ Router.post('/', (req, res, next) => __awaiter(void 0, void 0, void 0, function*
|
|
|
113
104
|
catch (e) {
|
|
114
105
|
next(e);
|
|
115
106
|
}
|
|
116
|
-
})
|
|
107
|
+
});
|
|
117
108
|
exports.default = Router;
|
|
118
109
|
//# sourceMappingURL=file-route.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-route.js","sourceRoot":"","sources":["../../../src/router/close/file-route.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-route.js","sourceRoot":"","sources":["../../../src/router/close/file-route.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
};
|
|
@@ -47,11 +38,11 @@ exports.default = () => {
|
|
|
47
38
|
res.json(index_2.MetadataStore.getAll());
|
|
48
39
|
});
|
|
49
40
|
TestCloseRouter.use((0, index_1.default)());
|
|
50
|
-
TestCloseRouter.get('/criterion/:entity', (req, res) =>
|
|
41
|
+
TestCloseRouter.get('/criterion/:entity', async (req, res) => {
|
|
51
42
|
const entity = req.params.entity;
|
|
52
43
|
const primaryKey = req.query.primaryKey;
|
|
53
44
|
const masterEntities = (0, convert_master_entity_1.default)(JSON.parse(req.query.masterEntities));
|
|
54
|
-
const criterionObject = new criterion_1.default(
|
|
45
|
+
const criterionObject = new criterion_1.default(await (0, get_criterion_config_1.default)(entity, "criterion"), {
|
|
55
46
|
accessToken: req.infoAccessToken,
|
|
56
47
|
masterEntities,
|
|
57
48
|
primaryEntity: entity,
|
|
@@ -59,9 +50,9 @@ exports.default = () => {
|
|
|
59
50
|
primaryId: primaryKey,
|
|
60
51
|
preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(req),
|
|
61
52
|
});
|
|
62
|
-
const criterion =
|
|
53
|
+
const criterion = await criterionObject.generate();
|
|
63
54
|
res.json(criterion);
|
|
64
|
-
})
|
|
55
|
+
});
|
|
65
56
|
TestCloseRouter.get('/is-real-test', (req, res) => {
|
|
66
57
|
res.json({
|
|
67
58
|
token: req.infoAccessToken
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"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"}
|