eservices-back-core 2.1.47 → 2.1.49
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.d.ts.map +1 -1
- package/dist/Server.js +2 -4
- package/dist/Server.js.map +1 -1
- package/dist/auth/finish-tumbler-request.d.ts.map +1 -1
- package/dist/auth/finish-tumbler-request.js +2 -4
- package/dist/auth/finish-tumbler-request.js.map +1 -1
- package/dist/auth/is-expired.d.ts.map +1 -1
- package/dist/auth/is-expired.js +4 -9
- package/dist/auth/is-expired.js.map +1 -1
- package/dist/auth/reload-session-promisify.js +4 -8
- package/dist/auth/reload-session-promisify.js.map +1 -1
- package/dist/auth/start-tumbler-request.d.ts.map +1 -1
- package/dist/auth/start-tumbler-request.js +2 -4
- package/dist/auth/start-tumbler-request.js.map +1 -1
- package/dist/auth/use-auth.d.ts.map +1 -1
- package/dist/auth/use-auth.js +41 -40
- package/dist/auth/use-auth.js.map +1 -1
- package/dist/controller/close-api/metadata-controller.d.ts.map +1 -1
- package/dist/errors/metadata-error.js +1 -1
- package/dist/errors/metadata-error.js.map +1 -1
- package/dist/logger/use-logger.d.ts +16 -5
- package/dist/logger/use-logger.d.ts.map +1 -1
- package/dist/logger/use-logger.js +20 -13
- package/dist/logger/use-logger.js.map +1 -1
- package/dist/middleware/error-middleware.d.ts.map +1 -1
- package/dist/middleware/error-middleware.js +12 -34
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +2 -5
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/model/criterion-collector.d.ts.map +1 -1
- package/dist/model/criterion-collector.js +4 -7
- package/dist/model/criterion-collector.js.map +1 -1
- package/dist/model/criterion.d.ts.map +1 -1
- package/dist/model/criterion.js +4 -9
- package/dist/model/criterion.js.map +1 -1
- package/dist/router/close/test-close-router.d.ts.map +1 -1
- package/dist/router/close/test-close-router.js +7 -1
- package/dist/router/close/test-close-router.js.map +1 -1
- package/dist/services/list-setting-service.d.ts.map +1 -1
- package/dist/services/list-setting-service.js +7 -9
- package/dist/services/list-setting-service.js.map +1 -1
- package/dist/services/metadata-service.d.ts.map +1 -1
- package/dist/services/metadata-service.js +2 -6
- package/dist/services/metadata-service.js.map +1 -1
- package/dist/socket/connect-socket.d.ts.map +1 -1
- package/dist/socket/connect-socket.js +18 -21
- package/dist/socket/connect-socket.js.map +1 -1
- package/dist/socket/core-socket-server.d.ts.map +1 -1
- package/dist/socket/core-socket-server.js +3 -9
- package/dist/socket/core-socket-server.js.map +1 -1
- package/dist/socket/events/client_read.d.ts.map +1 -1
- package/dist/socket/events/client_read.js +3 -5
- package/dist/socket/events/client_read.js.map +1 -1
- package/dist/socket/events/communication-message_create.d.ts +2 -2
- package/dist/socket/events/communication-message_create.d.ts.map +1 -1
- package/dist/socket/events/communication-message_create.js.map +1 -1
- package/dist/socket/events/communication-message_read.d.ts +2 -2
- package/dist/socket/events/communication-message_read.d.ts.map +1 -1
- package/dist/socket/events/communication-message_read.js.map +1 -1
- package/dist/socket/events/communication_create.d.ts +2 -2
- package/dist/socket/events/communication_create.d.ts.map +1 -1
- package/dist/socket/events/communication_create.js.map +1 -1
- package/dist/socket/events/communication_read.d.ts +2 -2
- package/dist/socket/events/communication_read.d.ts.map +1 -1
- package/dist/socket/events/communication_read.js.map +1 -1
- package/dist/socket/events/dashboard_read-licenses.d.ts +2 -2
- package/dist/socket/events/dashboard_read-licenses.d.ts.map +1 -1
- package/dist/socket/events/dashboard_read-licenses.js.map +1 -1
- package/dist/socket/events/entity_count.d.ts +2 -2
- package/dist/socket/events/entity_count.d.ts.map +1 -1
- package/dist/socket/events/entity_count.js +2 -4
- package/dist/socket/events/entity_count.js.map +1 -1
- package/dist/socket/events/entity_create.d.ts +2 -2
- package/dist/socket/events/entity_create.d.ts.map +1 -1
- package/dist/socket/events/entity_create.js +1 -4
- package/dist/socket/events/entity_create.js.map +1 -1
- package/dist/socket/events/entity_delete.d.ts +2 -2
- package/dist/socket/events/entity_delete.d.ts.map +1 -1
- package/dist/socket/events/entity_delete.js +1 -4
- package/dist/socket/events/entity_delete.js.map +1 -1
- package/dist/socket/events/entity_read.d.ts.map +1 -1
- package/dist/socket/events/entity_read.js +4 -7
- package/dist/socket/events/entity_read.js.map +1 -1
- package/dist/socket/events/history_read.d.ts.map +1 -1
- package/dist/socket/events/history_read.js +2 -4
- package/dist/socket/events/history_read.js.map +1 -1
- package/dist/socket/events/interface_navigation.d.ts.map +1 -1
- package/dist/socket/events/interface_navigation.js +4 -6
- package/dist/socket/events/interface_navigation.js.map +1 -1
- package/dist/socket/events/interface_notification.d.ts.map +1 -1
- package/dist/socket/events/interface_notification.js +0 -3
- package/dist/socket/events/interface_notification.js.map +1 -1
- package/dist/socket/events/list-setting_fix.d.ts +2 -2
- package/dist/socket/events/list-setting_fix.d.ts.map +1 -1
- package/dist/socket/events/list-setting_fix.js.map +1 -1
- package/dist/socket/events/list-setting_read.d.ts +2 -2
- package/dist/socket/events/list-setting_read.d.ts.map +1 -1
- package/dist/socket/events/list-setting_read.js.map +1 -1
- package/dist/socket/events/metadata-field_treat.d.ts +2 -2
- package/dist/socket/events/metadata-field_treat.d.ts.map +1 -1
- package/dist/socket/events/metadata-field_treat.js.map +1 -1
- package/dist/socket/events/metadata-list_read.d.ts +2 -2
- package/dist/socket/events/metadata-list_read.d.ts.map +1 -1
- package/dist/socket/events/metadata-list_read.js.map +1 -1
- package/dist/socket/events/metadata_read.d.ts +2 -2
- package/dist/socket/events/metadata_read.d.ts.map +1 -1
- package/dist/socket/events/metadata_read.js.map +1 -1
- package/dist/socket/events/tool-list_read.d.ts +2 -2
- package/dist/socket/events/tool-list_read.d.ts.map +1 -1
- package/dist/socket/events/tool-list_read.js.map +1 -1
- package/dist/socket/events/tool_execute.d.ts +2 -2
- package/dist/socket/events/tool_execute.d.ts.map +1 -1
- package/dist/socket/events/tool_execute.js +1 -4
- package/dist/socket/events/tool_execute.js.map +1 -1
- package/dist/socket/events/tool_read.d.ts +2 -2
- package/dist/socket/events/tool_read.d.ts.map +1 -1
- package/dist/socket/events/tool_read.js +2 -4
- package/dist/socket/events/tool_read.js.map +1 -1
- package/dist/socket/events/tool_task-parameters.d.ts.map +1 -1
- package/dist/socket/events/tool_task-parameters.js +0 -2
- package/dist/socket/events/tool_task-parameters.js.map +1 -1
- package/dist/socket/events/usage-context_read.d.ts +2 -2
- package/dist/socket/events/usage-context_read.d.ts.map +1 -1
- package/dist/socket/events/usage-context_read.js +1 -4
- package/dist/socket/events/usage-context_read.js.map +1 -1
- package/dist/store/list-store.d.ts.map +1 -1
- package/dist/store/list-store.js +1 -4
- package/dist/store/list-store.js.map +1 -1
- package/dist/store/metadata-store.d.ts.map +1 -1
- package/dist/store/metadata-store.js +8 -10
- package/dist/store/metadata-store.js.map +1 -1
- package/dist/types/auth-type.d.ts +1 -0
- package/dist/types/auth-type.d.ts.map +1 -1
- package/dist/utils/get-usage-context.js +3 -4
- package/dist/utils/get-usage-context.js.map +1 -1
- package/dist/utils/index.d.ts +0 -4
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +5 -13
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/nodeFetch.d.ts.map +1 -1
- package/dist/utils/nodeFetch.js +10 -17
- package/dist/utils/nodeFetch.js.map +1 -1
- package/dist/utils/parse-custom-required-attribute-values.d.ts.map +1 -1
- package/dist/utils/parse-custom-required-attribute-values.js +3 -5
- package/dist/utils/parse-custom-required-attribute-values.js.map +1 -1
- package/dist/utils/use-config.js +1 -1
- package/dist/utils/use-config.js.map +1 -1
- package/package.json +1 -1
|
@@ -17,25 +17,22 @@ const get_usage_context_1 = __importDefault(require("../utils/get-usage-context"
|
|
|
17
17
|
const configuration_read_1 = require("./events/configuration_read");
|
|
18
18
|
const core_socket_server_1 = __importDefault(require("./core-socket-server"));
|
|
19
19
|
const http_1 = __importDefault(require("http"));
|
|
20
|
-
const debug_1 = __importDefault(require("debug"));
|
|
21
20
|
const session_middleware_1 = require("../middleware/session-middleware");
|
|
22
21
|
const auth_middleware_1 = require("../middleware/auth-middleware");
|
|
23
22
|
const use_auth_1 = require("../auth/use-auth");
|
|
24
23
|
const use_logger_1 = require("../logger/use-logger");
|
|
25
|
-
const utils_1 = require("../utils");
|
|
26
24
|
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
27
25
|
const socket_error_1 = __importDefault(require("../errors/socket-error"));
|
|
28
26
|
const constants_1 = require("../constants");
|
|
29
27
|
const constants_2 = require("../constants");
|
|
30
28
|
const load_customer_info_by_external_1 = __importDefault(require("../utils/load-customer-info-by-external"));
|
|
31
29
|
const get_auth_state_form_request_1 = require("../auth/get-auth-state-form-request");
|
|
32
|
-
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('socket'));
|
|
33
30
|
/**
|
|
34
31
|
* @description Метод используется для присоединения сокета к HTTP серверу. Также добавляются простые обработчики для
|
|
35
32
|
* чтения данных и т.д.
|
|
36
33
|
*/
|
|
37
34
|
function connectSocket(webServer) {
|
|
38
|
-
debug("Socket was installed.");
|
|
35
|
+
use_logger_1.Logger.debug("Socket was installed.");
|
|
39
36
|
const socketServer = webServer.socket = new core_socket_server_1.default({
|
|
40
37
|
noServer: true,
|
|
41
38
|
perMessageDeflate: true,
|
|
@@ -45,20 +42,20 @@ function connectSocket(webServer) {
|
|
|
45
42
|
const userId = (0, use_auth_1.getUserIdFromAuthRequest)(req);
|
|
46
43
|
const personId = (0, use_auth_1.getPersonIdFromAuthRequest)(req);
|
|
47
44
|
if (!userId) {
|
|
48
|
-
use_logger_1.Logger.error(api_error_1.default.UnauthorizedAccess('socket'));
|
|
45
|
+
use_logger_1.Logger.error(api_error_1.default.UnauthorizedAccess('socket').toString());
|
|
49
46
|
return;
|
|
50
47
|
}
|
|
51
|
-
debug(`Socket connection for %d was implemented.`, userId);
|
|
48
|
+
use_logger_1.Logger.debug(`Socket connection for %d was implemented.`, userId);
|
|
52
49
|
socketServer.addSocket(ws, userId);
|
|
53
50
|
sendWSResponse(ws, 'configuration:read', (0, configuration_read_1.readConfiguration)());
|
|
54
|
-
debug("Socket was added to server and configuration was send.");
|
|
51
|
+
use_logger_1.Logger.debug("Socket was added to server and configuration was send.");
|
|
55
52
|
ws.on('error', (err) => {
|
|
56
|
-
debug('UserId %d Получена ошибка в socket соединении.');
|
|
53
|
+
use_logger_1.Logger.debug('UserId %d Получена ошибка в socket соединении.');
|
|
57
54
|
onSocketError(err);
|
|
58
55
|
});
|
|
59
56
|
ws.on('message', function message(stringData, isBinary) {
|
|
60
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
|
-
debug('UserId %d сообщение по web-socket получено, но ещё не проверено на авторизацию.', userId);
|
|
58
|
+
use_logger_1.Logger.debug('UserId %d сообщение по web-socket получено, но ещё не проверено на авторизацию.', userId);
|
|
62
59
|
// Refresh token
|
|
63
60
|
try {
|
|
64
61
|
yield (0, auth_middleware_1.authModule)().useWSAuthMiddleware(req);
|
|
@@ -66,10 +63,10 @@ function connectSocket(webServer) {
|
|
|
66
63
|
catch (e) {
|
|
67
64
|
return sendWSError(ws, { refresh: true });
|
|
68
65
|
}
|
|
69
|
-
debug('Socket-message from user(%d) authorize successfully.', userId);
|
|
66
|
+
use_logger_1.Logger.debug('Socket-message from user(%d) authorize successfully.', userId);
|
|
70
67
|
if (isBinary && stringData[0] === constants_1.SOCKET_HEARTBEAT_VALUE) {
|
|
71
68
|
ws.isAlive = true;
|
|
72
|
-
debug('UserId %d socket соединение живо.', userId);
|
|
69
|
+
use_logger_1.Logger.debug('UserId %d socket соединение живо.', userId);
|
|
73
70
|
return;
|
|
74
71
|
}
|
|
75
72
|
const info = JSON.parse(stringData.toString());
|
|
@@ -85,13 +82,13 @@ function connectSocket(webServer) {
|
|
|
85
82
|
};
|
|
86
83
|
const emit = (eventName, data) => sendWSResponse(ws, eventName, data);
|
|
87
84
|
const sendResult = wrapResponse(ws, info.requestId, info.event);
|
|
88
|
-
debug('UserId:%d RequestId:%d Event: %s event was received(+)', userId, info.requestId, info.event);
|
|
85
|
+
use_logger_1.Logger.debug('UserId:%d RequestId:%d Event: %s event was received(+)', userId, info.requestId, info.event);
|
|
89
86
|
// If handler for current event has been found.
|
|
90
87
|
if (socketServer.handlers[info.event])
|
|
91
88
|
sendResult(yield socketServer.handlers[info.event](options, info.data, { emit }));
|
|
92
89
|
else
|
|
93
90
|
sendWSError(ws, socket_error_1.default.UnknownSocketEvent(info.event), info.requestId);
|
|
94
|
-
debug('UserId:%d RequestId:%d Event: %s event was handled(-)', userId, info.requestId, info.event);
|
|
91
|
+
use_logger_1.Logger.debug('UserId:%d RequestId:%d Event: %s event was handled(-)', userId, info.requestId, info.event);
|
|
95
92
|
}
|
|
96
93
|
catch (err) {
|
|
97
94
|
use_logger_1.Logger.error(`Socket request error. UserId %d. RequestId %d %o`, userId, info.requestId, err);
|
|
@@ -100,7 +97,7 @@ function connectSocket(webServer) {
|
|
|
100
97
|
});
|
|
101
98
|
});
|
|
102
99
|
ws.on('close', () => {
|
|
103
|
-
debug("UserId %d socket был закрыт.", userId);
|
|
100
|
+
use_logger_1.Logger.debug("UserId %d socket был закрыт.", userId);
|
|
104
101
|
use_logger_1.Logger.info("Socket connection closed.");
|
|
105
102
|
socketServer.deleteSocket(ws.id);
|
|
106
103
|
});
|
|
@@ -113,25 +110,25 @@ function connectSocket(webServer) {
|
|
|
113
110
|
* После успешной авторизации, сокет соединение успешно устанавливается.
|
|
114
111
|
*/
|
|
115
112
|
webServer.httpServer.on('upgrade', function upgrade(request, socket, head) {
|
|
116
|
-
debug(`Start upgrade. Http Version: %s.`, request.httpVersion);
|
|
113
|
+
use_logger_1.Logger.debug(`Start upgrade. Http Version: %s.`, request.httpVersion);
|
|
117
114
|
const response = new http_1.default.ServerResponse(request);
|
|
118
115
|
response.assignSocket(socket);
|
|
119
116
|
response.on('finish', () => {
|
|
120
|
-
debug("Socket response finished");
|
|
117
|
+
use_logger_1.Logger.debug("Socket response finished");
|
|
121
118
|
response.socket.destroy();
|
|
122
119
|
});
|
|
123
120
|
(0, session_middleware_1.sessionParser)()(request, response, () => __awaiter(this, void 0, void 0, function* () {
|
|
124
121
|
socket.on('error', onSocketError);
|
|
125
122
|
try {
|
|
126
123
|
yield (0, auth_middleware_1.authModule)().useWSAuthMiddleware(request);
|
|
127
|
-
debug("Primary socket check auth was success!");
|
|
124
|
+
use_logger_1.Logger.debug("Primary socket check auth was success!");
|
|
128
125
|
const { userId, personId } = yield (0, load_customer_info_by_external_1.default)((0, use_auth_1.getFullAccessToken)(request), (0, get_auth_state_form_request_1.getAuthStateFormRequest)(request).claims.sub);
|
|
129
126
|
request.infoUserId = userId;
|
|
130
127
|
request.infoPersonId = personId;
|
|
131
128
|
request.infoAccessToken = (0, use_auth_1.getFullAccessToken)(request);
|
|
132
129
|
socket.removeListener('error', onSocketError);
|
|
133
130
|
socketServer.handleUpgrade(request, socket, head, function done(ws) {
|
|
134
|
-
debug("Socket Server handle upgrade and emit connection.");
|
|
131
|
+
use_logger_1.Logger.debug("Socket Server handle upgrade and emit connection.");
|
|
135
132
|
socketServer.emit('connection', ws, request);
|
|
136
133
|
});
|
|
137
134
|
}
|
|
@@ -141,7 +138,7 @@ function connectSocket(webServer) {
|
|
|
141
138
|
sendAuthWSReject(ws);
|
|
142
139
|
setTimeout(() => {
|
|
143
140
|
socket.destroy();
|
|
144
|
-
debug(`HTTP upgrade был отклонён, т.к. у пользователь не авторизован. %O`, e);
|
|
141
|
+
use_logger_1.Logger.debug(`HTTP upgrade был отклонён, т.к. у пользователь не авторизован. %O`, e);
|
|
145
142
|
}, 100);
|
|
146
143
|
});
|
|
147
144
|
}
|
|
@@ -153,8 +150,8 @@ exports.default = connectSocket;
|
|
|
153
150
|
* @description Функция при перехвате ошибки в сокете
|
|
154
151
|
*/
|
|
155
152
|
function onSocketError(err) {
|
|
156
|
-
debug(err);
|
|
157
|
-
use_logger_1.Logger.error(err);
|
|
153
|
+
use_logger_1.Logger.debug(err.toString());
|
|
154
|
+
use_logger_1.Logger.error(err.toString());
|
|
158
155
|
}
|
|
159
156
|
/**
|
|
160
157
|
* @description Обёртка для ответов. Используется, для ответа на текущее сообщение.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,mFAAyD;AACzD,oEAA8D;AAC9D,8EAAoD;AACpD,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,mFAAyD;AACzD,oEAA8D;AAC9D,8EAAoD;AACpD,gDAAwB;AACxB,yEAA+D;AAC/D,mEAAyD;AACzD,+CAA0G;AAC1G,qDAA4C;AAC5C,oEAA2C;AAC3C,0EAAiD;AACjD,4CAAoD;AAEpD,4CAAgD;AAChD,6GAAiF;AACjF,qFAA4E;AAG5E;;;GAGG;AACH,SAAwB,aAAa,CAAC,SAAiB;IACtD,mBAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;IAErC,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,GAAG,IAAI,4BAAgB,CAAC;QAC5D,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,IAAI;KACvB,CAAC;SACD,EAAE,CAAC,YAAY,EAAE,SAAe,UAAU,CAAC,EAAa,EAAE,GAAY;;YAEtE,MAAM,MAAM,GAAG,IAAA,mCAAwB,EAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,QAAQ,GAAG,IAAA,qCAA0B,EAAC,GAAG,CAAC,CAAC;YAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACb,mBAAM,CAAC,KAAK,CAAC,mBAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/D,OAAO;YACR,CAAC;YAED,mBAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE,MAAM,CAAC,CAAC;YAClE,YAAY,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YACnC,cAAc,CAAC,EAAE,EAAE,oBAAoB,EAAE,IAAA,sCAAiB,GAAE,CAAC,CAAA;YAC7D,mBAAM,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;YAEvE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACtB,mBAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAA;gBAC9D,aAAa,CAAC,GAAG,CAAC,CAAA;YACnB,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,SAAe,OAAO,CAAC,UAAU,EAAE,QAAQ;;oBAC3D,mBAAM,CAAC,KAAK,CAAC,iFAAiF,EAAE,MAAM,CAAC,CAAA;oBAEvG,gBAAgB;oBAChB,IAAI,CAAC;wBACJ,MAAM,IAAA,4BAAU,GAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;oBAC7C,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACZ,OAAO,WAAW,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC3C,CAAC;oBACD,mBAAM,CAAC,KAAK,CAAC,sDAAsD,EAAE,MAAM,CAAC,CAAC;oBAE7E,IAAI,QAAQ,IAAK,UAAkB,CAAC,CAAC,CAAC,KAAK,kCAAsB,EAAE,CAAC;wBACnE,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC;wBAClB,mBAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,MAAM,CAAC,CAAC;wBAC1D,OAAO;oBACR,CAAC;oBAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAmB,CAAC;oBAEjE,IAAI,CAAC;wBACJ,MAAM,OAAO,GAAyB;4BACrC,KAAK,EAAE,IAAA,6BAAkB,EAAC,GAAG,CAAC;4BAC9B,YAAY,EAAE,IAAA,2BAAe,EAAC,IAAI,CAAC,GAAG,CAAC;4BACvC,SAAS,EAAE,IAAI,CAAC,SAAS;4BACzB,MAAM;4BACN,QAAQ;4BACR,SAAS,EAAE,IAAI,CAAC,SAAS;4BACzB,KAAK,EAAE,IAAI,CAAC,KAAK;yBACjB,CAAA;wBAED,MAAM,IAAI,GAAG,CAAC,SAAiB,EAAE,IAAS,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;wBAEnF,MAAM,UAAU,GAAG,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;wBAChE,mBAAM,CAAC,KAAK,CAAC,wDAAwD,EAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;wBAC1G,+CAA+C;wBAC/C,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;4BAAE,UAAU,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,EAAC,IAAI,EAAC,CAAC,CAAC,CAAC;;4BAClH,WAAW,CAAC,EAAE,EAAE,sBAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;wBACjF,mBAAM,CAAC,KAAK,CAAC,uDAAuD,EAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC1G,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACd,mBAAM,CAAC,KAAK,CAAC,kDAAkD,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;wBAC9F,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;oBACrC,CAAC;gBACF,CAAC;aAAA,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACnB,mBAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,MAAM,CAAC,CAAC;gBACrD,mBAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;gBACzC,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAClC,CAAC,CAAC,CAAA;QACH,CAAC;KAAA,CAAC,CAAA;IAEF;;;;;OAKG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,OAAO,CAAC,OAAgB,EAAE,MAAM,EAAE,IAAI;QACjF,mBAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,IAAI,cAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAClD,QAAQ,CAAC,YAAY,CAAC,MAAa,CAAC,CAAC;QAErC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC1B,mBAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;YACzC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;QAC1B,CAAC,CAAC,CAAC;QAEH,IAAA,kCAAa,GAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAS,EAAE;YAC7C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YAClC,IAAI,CAAC;gBACJ,MAAM,IAAA,4BAAU,GAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;gBAChD,mBAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBACvD,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAC,GAAG,MAAM,IAAA,wCAA0B,EAAC,IAAA,6BAAkB,EAAC,OAAO,CAAC,EAAE,IAAA,qDAAuB,EAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;gBACrI,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC;gBAC5B,OAAO,CAAC,YAAY,GAAG,QAAQ,CAAC;gBAChC,OAAO,CAAC,eAAe,GAAG,IAAA,6BAAkB,EAAC,OAAO,CAAC,CAAC;gBACtD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;gBAC9C,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,IAAI,CAAC,EAAE;oBACjE,mBAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;oBAClE,YAAY,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;gBAC9C,CAAC,CAAC,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBAEZ,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,IAAI,CAAC,EAAE;oBACjE,aAAa;oBACb,gBAAgB,CAAC,EAAE,CAAC,CAAA;oBACpB,UAAU,CAAC,GAAG,EAAE;wBACf,MAAM,CAAC,OAAO,EAAE,CAAC;wBACjB,mBAAM,CAAC,KAAK,CAAC,mEAAmE,EAAE,CAAC,CAAC,CAAC;oBACtF,CAAC,EAAE,GAAG,CAAC,CAAA;gBACR,CAAC,CAAC,CAAA;YAGH,CAAC;QACF,CAAC,CAAA,CAAC,CAAA;IACH,CAAC,CAAC,CAAC;AACJ,CAAC;AA3HD,gCA2HC;AACD;;GAEG;AACH,SAAS,aAAa,CAAkB,GAAM;IAC7C,mBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7B,mBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,SAAS,YAAY,CAAC,EAAa,EAAE,SAAiB,EAAE,YAAqB;IAC5E,OAAO,CAAC,QAAa,EAAE,KAAc,EAAE,EAAE;QACxC,cAAc,CAAC,EAAE,EAAE,KAAK,IAAI,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC,CAAA;AACF,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,cAAc,CAAC,EAAa,EAAE,KAAa,EAAE,QAAa,EAAE,YAAoB,CAAC;IAChG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;QACtB,SAAS;QACT,KAAK;QACL,IAAI,EAAE,QAAQ;KACd,CAAC,CAAC,CAAA;AACJ,CAAC;AAND,wCAMC;AAED,SAAS,gBAAgB,CAAC,EAAa;IACtC,cAAc,CAAC,EAAE,EAAE,8BAAkB,EAAE;QACtC,OAAO,EAAE,IAAI;KACb,CAAC,CAAA;AACH,CAAC;AAGD;;;GAGG;AACH,SAAS,WAAW,CAAC,EAAa,EAAE,QAAa,EAAE,YAAoB,CAAC;IACvE,MAAM,IAAI,GAGN,EAAE,CAAC;IAGP,IAAI,OAAO,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAA,KAAK,QAAQ;QAAE,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAC3E,IAAI,OAAO,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,cAAc,CAAA,KAAK,QAAQ;QAAE,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC;IACzF,IAAI,OAAO,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAA,KAAK,QAAQ;QAAE,QAAQ,CAAC,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjF,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IAErE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;QACtB,SAAS;QACT,KAAK,EAAE,8BAAkB;QACzB,IAAI;KACJ,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-socket-server.d.ts","sourceRoot":"","sources":["../../src/socket/core-socket-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"core-socket-server.d.ts","sourceRoot":"","sources":["../../src/socket/core-socket-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AAgCzD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,eAAe;gBAChD,MAAM,KAAA;IAkDlB;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM;IAM9B;;OAEG;IACH,aAAa;IAIb;;OAEG;IACH,WAAW,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAY;IACrD;;;OAGG;IACH,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAa;IAE1D;;OAEG;IACH,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;IAUvC;;OAEG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM;IAU7B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;CAC7C;AAED,KAAK,YAAY,GAAG,MAAM,CAAA"}
|
|
@@ -1,12 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
const ws_1 = require("ws");
|
|
7
4
|
const uuid_1 = require("uuid");
|
|
8
|
-
const debug_1 = __importDefault(require("debug"));
|
|
9
|
-
const utils_1 = require("../utils");
|
|
10
5
|
const constants_1 = require("../constants");
|
|
11
6
|
const configuration_read_1 = require("./events/configuration_read");
|
|
12
7
|
const tool_read_1 = require("./events/tool_read");
|
|
@@ -37,7 +32,7 @@ const wizard_1 = require("./events/wizard");
|
|
|
37
32
|
const tool_task_parameters_1 = require("./events/tool_task-parameters");
|
|
38
33
|
const batch_update_1 = require("./events/batch_update");
|
|
39
34
|
const entity_resolve_1 = require("./events/entity_resolve");
|
|
40
|
-
const
|
|
35
|
+
const use_logger_1 = require("../logger/use-logger");
|
|
41
36
|
class CoreSocketServer extends ws_1.WebSocketServer {
|
|
42
37
|
constructor(params) {
|
|
43
38
|
super(params);
|
|
@@ -54,7 +49,7 @@ class CoreSocketServer extends ws_1.WebSocketServer {
|
|
|
54
49
|
this.getAllSockets().forEach(socket => {
|
|
55
50
|
if (!socket.isAlive) {
|
|
56
51
|
socket.terminate();
|
|
57
|
-
debug('UserId %d socket is terminated due to not being alive.', socket.userId);
|
|
52
|
+
use_logger_1.Logger.debug('UserId %d socket is terminated due to not being alive.', socket.userId);
|
|
58
53
|
return;
|
|
59
54
|
}
|
|
60
55
|
socket.isAlive = false;
|
|
@@ -120,7 +115,6 @@ class CoreSocketServer extends ws_1.WebSocketServer {
|
|
|
120
115
|
if (!this.socketClients.get(userId))
|
|
121
116
|
this.socketClients.set(userId, new Set());
|
|
122
117
|
this.socketClients.get(userId).add(ws.id);
|
|
123
|
-
ws.send;
|
|
124
118
|
}
|
|
125
119
|
/**
|
|
126
120
|
* @description Начисто удаляет сокет соединение по ws-id
|
|
@@ -136,7 +130,7 @@ class CoreSocketServer extends ws_1.WebSocketServer {
|
|
|
136
130
|
}
|
|
137
131
|
exports.default = CoreSocketServer;
|
|
138
132
|
function ping(client) {
|
|
139
|
-
debug(`Для userId %d отправлен ping`, client.userId);
|
|
133
|
+
use_logger_1.Logger.debug(`Для userId %d отправлен ping`, client.userId);
|
|
140
134
|
client.send(constants_1.SOCKET_HEARTBEAT_VALUE, { binary: true });
|
|
141
135
|
}
|
|
142
136
|
//# sourceMappingURL=core-socket-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-socket-server.js","sourceRoot":"","sources":["../../src/socket/core-socket-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"core-socket-server.js","sourceRoot":"","sources":["../../src/socket/core-socket-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/client_read.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oBAAoB,EAAQ,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"client_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/client_read.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oBAAoB,EAAQ,MAAM,kBAAkB,CAAC;AAG7D,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGlD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,CA2B5G"}
|
|
@@ -16,16 +16,14 @@ exports.readClientSocket = void 0;
|
|
|
16
16
|
const data_service_1 = __importDefault(require("../../services/data-service"));
|
|
17
17
|
const Server_1 = __importDefault(require("../../Server"));
|
|
18
18
|
const account_service_1 = __importDefault(require("../../services/account-service"));
|
|
19
|
-
const
|
|
20
|
-
const utils_1 = require("../../utils");
|
|
21
|
-
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('client_read'));
|
|
19
|
+
const use_logger_1 = require("../../logger/use-logger");
|
|
22
20
|
function readClientSocket(options, data) {
|
|
23
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
22
|
const dataService = new data_service_1.default(options.token);
|
|
25
23
|
const userData = yield dataService.getById('User', options.userId, {
|
|
26
24
|
fields: "FullName UserName"
|
|
27
25
|
});
|
|
28
|
-
debug('User data was uploaded.');
|
|
26
|
+
use_logger_1.Logger.debug('User data was uploaded.');
|
|
29
27
|
const fullName = userData.FullName || userData.UserName;
|
|
30
28
|
if (Server_1.default.instance.type === 'back') {
|
|
31
29
|
return {
|
|
@@ -37,7 +35,7 @@ function readClientSocket(options, data) {
|
|
|
37
35
|
}
|
|
38
36
|
const accountService = new account_service_1.default(options.token);
|
|
39
37
|
const organizations = yield accountService.getOrganizationListForPerson(options.personId);
|
|
40
|
-
debug('Organizations list was uploaded.');
|
|
38
|
+
use_logger_1.Logger.debug('Organizations list was uploaded.');
|
|
41
39
|
return Server_1.default.instance.clientContentHook(options, {
|
|
42
40
|
id: options.personId,
|
|
43
41
|
userId: options.userId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_read.js","sourceRoot":"","sources":["../../../src/socket/events/client_read.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+EAAsD;AAEtD,0DAAkC;AAClC,qFAA4D;
|
|
1
|
+
{"version":3,"file":"client_read.js","sourceRoot":"","sources":["../../../src/socket/events/client_read.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+EAAsD;AAEtD,0DAAkC;AAClC,qFAA4D;AAE5D,wDAA+C;AAE/C,SAAsB,gBAAgB,CAAC,OAA6B,EAAE,IAAa;;QAClF,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAQ,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;YACzE,MAAM,EAAE,mBAAmB;SAC3B,CAAC,CAAA;QACF,mBAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAExC,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC;QAExD,IAAI,gBAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACrC,OAAO;gBACN,EAAE,EAAE,OAAO,CAAC,MAAM;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,IAAI,EAAE,QAAQ;gBACd,aAAa,EAAE,EAAE;aACjB,CAAA;QACF,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,yBAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,4BAA4B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC1F,mBAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACjD,OAAO,gBAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,EAAE;YACjD,EAAE,EAAE,OAAO,CAAC,QAAQ;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,IAAI,EAAE,QAAQ;YACd,aAAa,EAAE,aAAa,IAAI,EAAE;SAClC,CAAC,CAAA;IACH,CAAC;CAAA;AA3BD,4CA2BC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare function communicationMessageCreate(options:
|
|
1
|
+
import { ICustomerRequestInfo } from "../../types/main";
|
|
2
|
+
export declare function communicationMessageCreate(options: ICustomerRequestInfo, data: unknown): Promise<import("../../types/communication").ICommunicationMessageReadingResult>;
|
|
3
3
|
//# sourceMappingURL=communication-message_create.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"communication-message_create.d.ts","sourceRoot":"","sources":["../../../src/socket/events/communication-message_create.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"communication-message_create.d.ts","sourceRoot":"","sources":["../../../src/socket/events/communication-message_create.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAEtD,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,mFAM5F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"communication-message_create.js","sourceRoot":"","sources":["../../../src/socket/events/communication-message_create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"communication-message_create.js","sourceRoot":"","sources":["../../../src/socket/events/communication-message_create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,uEAA8C;AAC9C,iGAAwE;AAGxE,SAAsB,0BAA0B,CAAC,OAA6B,EAAE,IAAa;;QAC5F,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,iBAAiB,EAAE,CAAC;QAE3E,MAAM,oBAAoB,GAAG,IAAI,+BAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAErE,OAAO,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;CAAA;AAND,gEAMC;AAED,MAAM,2BAA2B,GAAG,CAAC,IAAa,EAA6C,EAAE,CAChG,CAAC,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;IAClC,OAAQ,IAA0C,CAAC,eAAe,KAAK,QAAQ,CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare function communicationMessageRead(options:
|
|
1
|
+
import { ICustomerRequestInfo } from "../../types/main";
|
|
2
|
+
export declare function communicationMessageRead(options: ICustomerRequestInfo, data: unknown): Promise<import("../../types/communication").ICommunicationMessageReadingResult[]>;
|
|
3
3
|
//# sourceMappingURL=communication-message_read.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"communication-message_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/communication-message_read.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"communication-message_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/communication-message_read.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAEtD,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,qFAM1F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"communication-message_read.js","sourceRoot":"","sources":["../../../src/socket/events/communication-message_read.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"communication-message_read.js","sourceRoot":"","sources":["../../../src/socket/events/communication-message_read.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uEAA8C;AAC9C,iGAAwE;AAGxE,SAAsB,wBAAwB,CAAC,OAA6B,EAAE,IAAa;;QAC1F,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,iBAAiB,EAAE,CAAC;QAE3E,MAAM,oBAAoB,GAAG,IAAI,+BAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAErE,OAAO,oBAAoB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;CAAA;AAND,4DAMC;AAED,MAAM,2BAA2B,GAAG,CAAC,IAAa,EAA2C,EAAE,CAC9F,CAAC,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;IAClC,OAAQ,IAAwC,CAAC,eAAe,KAAK,QAAQ,CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare function communicationCreate(options:
|
|
1
|
+
import { ICustomerRequestInfo } from "../../types/main";
|
|
2
|
+
export declare function communicationCreate(options: ICustomerRequestInfo, data: unknown): Promise<import("../../types/communication").ICommunicationCreationResult>;
|
|
3
3
|
//# sourceMappingURL=communication_create.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"communication_create.d.ts","sourceRoot":"","sources":["../../../src/socket/events/communication_create.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"communication_create.d.ts","sourceRoot":"","sources":["../../../src/socket/events/communication_create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAEtD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,6EAMrF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"communication_create.js","sourceRoot":"","sources":["../../../src/socket/events/communication_create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"communication_create.js","sourceRoot":"","sources":["../../../src/socket/events/communication_create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uEAA8C;AAC9C,iGAAwE;AAGxE,SAAsB,mBAAmB,CAAC,OAA6B,EAAE,IAAa;;QACrF,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,iBAAiB,EAAE,CAAC;QAE3E,MAAM,oBAAoB,GAAG,IAAI,+BAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAErE,OAAO,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;CAAA;AAND,kDAMC;AAED,MAAM,2BAA2B,GAAG,CAAC,IAAa,EAAsC,EAAE,CACzF,CAAC,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;IAClC,OAAQ,IAAmC,CAAC,UAAU,KAAK,QAAQ;IACnE,OAAQ,IAAmC,CAAC,UAAU,KAAK,QAAQ;IACnE,OAAQ,IAAmC,CAAC,eAAe,KAAK,QAAQ,CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare function communicationRead(options:
|
|
1
|
+
import { ICustomerRequestInfo } from "../../types/main";
|
|
2
|
+
export declare function communicationRead(options: ICustomerRequestInfo, data: unknown): Promise<import("../../types/communication").ICommunicationReadingResult[]>;
|
|
3
3
|
//# sourceMappingURL=communication_read.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"communication_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/communication_read.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"communication_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/communication_read.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAEtD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,8EAMnF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"communication_read.js","sourceRoot":"","sources":["../../../src/socket/events/communication_read.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"communication_read.js","sourceRoot":"","sources":["../../../src/socket/events/communication_read.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uEAA8C;AAC9C,iGAAwE;AAGxE,SAAsB,iBAAiB,CAAC,OAA6B,EAAE,IAAa;;QACnF,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,iBAAiB,EAAE,CAAC;QAE3E,MAAM,oBAAoB,GAAG,IAAI,+BAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAErE,OAAO,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CAAA;AAND,8CAMC;AAED,MAAM,2BAA2B,GAAG,CAAC,IAAa,EAAsC,EAAE,CACzF,CAAC,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;IAClC,OAAQ,IAAmC,CAAC,UAAU,KAAK,QAAQ;IACnE,OAAQ,IAAmC,CAAC,UAAU,KAAK,QAAQ;IACnE,OAAQ,IAAmC,CAAC,eAAe,KAAK,QAAQ,CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare function readDashboardLicenses(options:
|
|
1
|
+
import { ICustomerRequestInfo } from "../../types/main";
|
|
2
|
+
export declare function readDashboardLicenses(options: ICustomerRequestInfo, data: unknown): Promise<import("../../types/dashboard-type").IDashboardReadLicenseResult[]>;
|
|
3
3
|
//# sourceMappingURL=dashboard_read-licenses.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard_read-licenses.d.ts","sourceRoot":"","sources":["../../../src/socket/events/dashboard_read-licenses.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dashboard_read-licenses.d.ts","sourceRoot":"","sources":["../../../src/socket/events/dashboard_read-licenses.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAEtD,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,+EAKvF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard_read-licenses.js","sourceRoot":"","sources":["../../../src/socket/events/dashboard_read-licenses.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;
|
|
1
|
+
{"version":3,"file":"dashboard_read-licenses.js","sourceRoot":"","sources":["../../../src/socket/events/dashboard_read-licenses.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;AAC9C,yFAAgE;AAIhE,SAAsB,qBAAqB,CAAC,OAA6B,EAAE,IAAa;;QACvF,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,2BAA2B,EAAE,CAAC;QAEvF,MAAM,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7D,OAAO,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAC1D,CAAC;CAAA;AALD,sDAKC;AAED,MAAM,6BAA6B,GAAG,CAAC,KAAc,EACd,EAAE,CACxC,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare function getCountEntitySocket(options:
|
|
1
|
+
import { ICustomerRequestInfo } from "../../types/main";
|
|
2
|
+
export declare function getCountEntitySocket(options: ICustomerRequestInfo, data: unknown): Promise<import("../../types/entity-count-type").IEntityCountResult>;
|
|
3
3
|
//# sourceMappingURL=entity_count.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_count.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_count.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"entity_count.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_count.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAGtD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,uEActF"}
|
|
@@ -17,9 +17,7 @@ const api_error_1 = __importDefault(require("../../errors/api-error"));
|
|
|
17
17
|
const data_service_1 = __importDefault(require("../../services/data-service"));
|
|
18
18
|
const get_extend_customer_filters_1 = require("../../utils/get-extend-customer-filters");
|
|
19
19
|
const Server_1 = __importDefault(require("../../Server"));
|
|
20
|
-
const
|
|
21
|
-
const utils_1 = require("../../utils");
|
|
22
|
-
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)("socket:entity-count"));
|
|
20
|
+
const use_logger_1 = require("../../logger/use-logger");
|
|
23
21
|
function getCountEntitySocket(options, data) {
|
|
24
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
23
|
if (!isEntityCountParams(data))
|
|
@@ -28,7 +26,7 @@ function getCountEntitySocket(options, data) {
|
|
|
28
26
|
let filter = "";
|
|
29
27
|
if (Server_1.default.instance.type === 'front')
|
|
30
28
|
filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(data.filter, options.contextId, data.entity);
|
|
31
|
-
debug(`For entity "%s" result filter %s`, data.entity, filter);
|
|
29
|
+
use_logger_1.Logger.debug(`For entity "%s" result filter %s`, data.entity, filter);
|
|
32
30
|
return dataService.getCount(data.entity, {
|
|
33
31
|
filter
|
|
34
32
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_count.js","sourceRoot":"","sources":["../../../src/socket/events/entity_count.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;
|
|
1
|
+
{"version":3,"file":"entity_count.js","sourceRoot":"","sources":["../../../src/socket/events/entity_count.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;AAC9C,+EAAsD;AACtD,yFAAkF;AAClF,0DAAkC;AAGlC,wDAA+C;AAE/C,SAAsB,oBAAoB,CAAC,OAA6B,EAAE,IAAa;;QACnF,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,2BAA2B,EAAE,CAAC;QAE7E,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEnD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,gBAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO;YAChC,MAAM,GAAG,MAAM,IAAA,uDAAyB,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1F,mBAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEtE,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;YACrC,MAAM;SACT,CAAC,CAAA;IACN,CAAC;CAAA;AAdD,oDAcC;AAED,MAAM,mBAAmB,GAAG,CAAC,KAAc,EACX,EAAE,CAC9B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA4B,CAAC,MAAM,KAAK,QAAQ,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ISocketOptions } from "../../types/socket-type";
|
|
2
1
|
import { IMasterEntity } from "../../types/metadata-type";
|
|
3
|
-
|
|
2
|
+
import { ICustomerRequestInfo } from "../../index";
|
|
3
|
+
export declare function createEntity(options: ICustomerRequestInfo, data: unknown): Promise<import("../../types/main").IRequestCreateResult>;
|
|
4
4
|
export interface IEntityCreationParams {
|
|
5
5
|
entity: string;
|
|
6
6
|
values: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_create.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"entity_create.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAQxD,OAAO,EAAY,oBAAoB,EAAS,MAAM,aAAa,CAAC;AAEpE,wBAAsB,YAAY,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,4DAgB9E;AAQD,MAAM,WAAW,qBAAqB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,GAAG,CAAC;IACZ,cAAc,CAAC,EAAE,aAAa,GAAG,aAAa,EAAE,CAAA;CAChD"}
|
|
@@ -13,8 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.createEntity = void 0;
|
|
16
|
-
const debug_1 = __importDefault(require("debug"));
|
|
17
|
-
const utils_1 = require("../../utils");
|
|
18
16
|
const entity_error_1 = __importDefault(require("../../errors/entity-error"));
|
|
19
17
|
const transform_update_values_1 = __importDefault(require("../../utils/transform-update-values"));
|
|
20
18
|
const criterion_1 = __importDefault(require("../../model/criterion"));
|
|
@@ -23,7 +21,6 @@ const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
|
|
|
23
21
|
const data_service_1 = __importDefault(require("../../services/data-service"));
|
|
24
22
|
const convert_master_entity_1 = __importDefault(require("../../utils/convert-master-entity"));
|
|
25
23
|
const index_1 = require("../../index");
|
|
26
|
-
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)("entity-create"));
|
|
27
24
|
function createEntity(options, data) {
|
|
28
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
26
|
if (!IEntityCreationParams(data))
|
|
@@ -37,7 +34,7 @@ function createEntity(options, data) {
|
|
|
37
34
|
accessToken: options.token, masterEntities: convertedMasterEntities
|
|
38
35
|
});
|
|
39
36
|
const criterion = yield criterionObject.generate();
|
|
40
|
-
debug('Creating entity "%s" with criterion "%s" and values: %O, masterEntities: %O', data.entity, criterion, data.values, convertedMasterEntities);
|
|
37
|
+
index_1.Logger.debug('Creating entity "%s" with criterion "%s" and values: %O, masterEntities: %O', data.entity, criterion, data.values, convertedMasterEntities);
|
|
41
38
|
return dataService.create(data.entity, (0, transform_update_values_1.default)(data.values), options.usageContext, criterion);
|
|
42
39
|
});
|
|
43
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_create.js","sourceRoot":"","sources":["../../../src/socket/events/entity_create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"entity_create.js","sourceRoot":"","sources":["../../../src/socket/events/entity_create.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,6EAAoD;AACpD,kGAAwE;AACxE,sEAA8C;AAC9C,4FAAkE;AAClE,2EAAqF;AACrF,+EAAsD;AACtD,8FAAoE;AACpE,uCAAoE;AAEpE,SAAsB,YAAY,CAAC,OAA6B,EAAE,IAAa;;QAC9E,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC;YAAE,MAAM,sBAAW,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACxF,IAAI,OAAO,CAAC,YAAY,KAAK,IAAI;YAAE,MAAM,iBAAS,CAAC,kCAAkC,EAAE,CAAC;QAExF,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACnD,MAAM,uBAAuB,GAAG,IAAA,+BAAmB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACxE,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,MAAM,IAAA,8BAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC5E,aAAa,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAA,0DAAmC,EAAC,OAAO,CAAC;YAChF,WAAW,EAAE,OAAO,CAAC,KAAK,EAAE,cAAc,EAAE,uBAAuB;SACnE,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC;QAEnD,cAAM,CAAC,KAAK,CAAC,6EAA6E,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAA;QAEzJ,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAA,iCAAqB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAE7G,CAAC;CAAA;AAhBD,oCAgBC;AAED,MAAM,qBAAqB,GAAG,CAAC,KAAc,EACb,EAAE,CACjC,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA+B,CAAC,MAAM,KAAK,QAAQ;IAChF,QAAQ,IAAI,KAAK,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare function deleteEntity(options:
|
|
1
|
+
import { ICustomerRequestInfo } from "../../index";
|
|
2
|
+
export declare function deleteEntity(options: ICustomerRequestInfo, data: unknown): Promise<any>;
|
|
3
3
|
export interface IEntityDeleteParams {
|
|
4
4
|
entity: string;
|
|
5
5
|
id: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_delete.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_delete.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"entity_delete.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_delete.ts"],"names":[],"mappings":"AAMA,OAAO,EAAY,oBAAoB,EAAS,MAAM,aAAa,CAAC;AAEpE,wBAAsB,YAAY,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,gBAkB9E;AAQD,MAAM,WAAW,mBAAmB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,OAAO,CAAA;CACvB"}
|
|
@@ -19,10 +19,7 @@ const criterion_1 = __importDefault(require("../../model/criterion"));
|
|
|
19
19
|
const get_criterion_config_1 = __importDefault(require("../../utils/get-criterion-config"));
|
|
20
20
|
const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
|
|
21
21
|
const convert_master_entity_1 = __importDefault(require("../../utils/convert-master-entity"));
|
|
22
|
-
const debug_1 = __importDefault(require("debug"));
|
|
23
|
-
const utils_1 = require("../../utils");
|
|
24
22
|
const index_1 = require("../../index");
|
|
25
|
-
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)("entity-delete"));
|
|
26
23
|
function deleteEntity(options, data) {
|
|
27
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
25
|
if (!isEntityDeleteParams(data))
|
|
@@ -38,7 +35,7 @@ function deleteEntity(options, data) {
|
|
|
38
35
|
masterEntities: (0, convert_master_entity_1.default)(data.masterEntities)
|
|
39
36
|
});
|
|
40
37
|
const criterion = yield criterionObject.generate();
|
|
41
|
-
debug(`removing with Entity(%s), Id(%d), Version(%d), Criterion(%s)`, data.entity, data.id, data.version, criterion);
|
|
38
|
+
index_1.Logger.debug(`removing with Entity(%s), Id(%d), Version(%d), Criterion(%s)`, data.entity, data.id, data.version, criterion);
|
|
42
39
|
return dataService.remove(data.entity, data.id, data.version, options.usageContext, criterion);
|
|
43
40
|
});
|
|
44
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_delete.js","sourceRoot":"","sources":["../../../src/socket/events/entity_delete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;
|
|
1
|
+
{"version":3,"file":"entity_delete.js","sourceRoot":"","sources":["../../../src/socket/events/entity_delete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;AAC9C,+EAAsD;AACtD,sEAA8C;AAC9C,4FAAkE;AAClE,2EAAqF;AACrF,8FAAoE;AACpE,uCAAoE;AAEpE,SAAsB,YAAY,CAAC,OAA6B,EAAE,IAAa;;QAC9E,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,2BAA2B,EAAE,CAAC;QAC9E,IAAI,OAAO,CAAC,YAAY,KAAK,IAAI;YAAE,MAAM,iBAAS,CAAC,kCAAkC,EAAE,CAAC;QAExF,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,MAAM,IAAA,8BAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC5E,aAAa,EAAE,IAAI,CAAC,MAAM;YAC1B,SAAS,EAAE,IAAI,CAAC,EAAE;YAClB,MAAM,EAAE,IAAA,0DAAmC,EAAC,OAAO,CAAC;YACpD,WAAW,EAAE,OAAO,CAAC,KAAK;YAC1B,cAAc,EAAE,IAAA,+BAAmB,EAAC,IAAI,CAAC,cAAc,CAAC;SACxD,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC;QAEnD,cAAM,CAAC,KAAK,CAAC,8DAA8D,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE5H,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IAC/F,CAAC;CAAA;AAlBD,oCAkBC;AAED,MAAM,oBAAoB,GAAG,CAAC,KAAc,EACd,EAAE,CAC/B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA6B,CAAC,MAAM,KAAK,QAAQ;IAC9E,IAAI,IAAI,KAAK,IAAI,OAAQ,KAA6B,CAAC,EAAE,KAAK,QAAQ,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_read.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"entity_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_read.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAItD,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAIhE,wBAAsB,UAAU,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,oBAoE5E;AAOD,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,aAAa,CAAC,EAAE,iBAAiB,EAAE,CAAA;CACnC"}
|
|
@@ -17,8 +17,6 @@ const api_error_1 = __importDefault(require("../../errors/api-error"));
|
|
|
17
17
|
const data_service_1 = __importDefault(require("../../services/data-service"));
|
|
18
18
|
const Server_1 = __importDefault(require("../../Server"));
|
|
19
19
|
const get_extend_customer_filters_1 = require("../../utils/get-extend-customer-filters");
|
|
20
|
-
const debug_1 = __importDefault(require("debug"));
|
|
21
|
-
const utils_1 = require("../../utils");
|
|
22
20
|
const jenesius_vue_form_1 = require("jenesius-vue-form");
|
|
23
21
|
const parse_order_1 = __importDefault(require("../../utils/parse-order"));
|
|
24
22
|
const custom_filters_store_1 = __importDefault(require("../../store/custom-filters-store"));
|
|
@@ -26,7 +24,6 @@ const use_logger_1 = require("../../logger/use-logger");
|
|
|
26
24
|
const get_required_attribute_values_1 = __importDefault(require("../../utils/get-required-attribute-values"));
|
|
27
25
|
const iterate_entity_value_with_hooks_1 = __importDefault(require("../../utils/iterate-entity-value-with-hooks"));
|
|
28
26
|
const index_1 = require("../../index");
|
|
29
|
-
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)("socket:entity-read"));
|
|
30
27
|
function readEntity(options, data) {
|
|
31
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
29
|
if (!isEntityReadParams(data))
|
|
@@ -46,7 +43,7 @@ function readEntity(options, data) {
|
|
|
46
43
|
if (Server_1.default.instance.type === 'front' && data.useContextFilter !== false)
|
|
47
44
|
filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(filter, options.contextId, data.entity);
|
|
48
45
|
if (data.customFilters && Array.isArray(data.customFilters)) {
|
|
49
|
-
debug('Custom filters(%s): %o', data.entity, data.customFilters);
|
|
46
|
+
use_logger_1.Logger.debug('Custom filters(%s): %o', data.entity, data.customFilters);
|
|
50
47
|
const generatedCustomFilters = yield Promise.all(data.customFilters.map((customFilterInfo) => __awaiter(this, void 0, void 0, function* () {
|
|
51
48
|
const customFilterName = typeof customFilterInfo === 'string' ? customFilterInfo : customFilterInfo.name;
|
|
52
49
|
const customerFilterAttributes = typeof customFilterInfo === 'string' ? {} : (customFilterInfo.arguments || {});
|
|
@@ -56,13 +53,13 @@ function readEntity(options, data) {
|
|
|
56
53
|
return null;
|
|
57
54
|
}
|
|
58
55
|
const insideValue = yield (0, get_required_attribute_values_1.default)(filterConfig, options, customerFilterAttributes);
|
|
59
|
-
debug(insideValue);
|
|
56
|
+
use_logger_1.Logger.debug(JSON.stringify(insideValue));
|
|
60
57
|
return filterConfig.generate(insideValue);
|
|
61
58
|
})));
|
|
62
|
-
debug('Result Custom filters: %s', generatedCustomFilters);
|
|
59
|
+
use_logger_1.Logger.debug('Result Custom filters: %s', generatedCustomFilters);
|
|
63
60
|
filter = (0, get_extend_customer_filters_1.joinFilters)(filter, ...generatedCustomFilters.filter(item => !!item));
|
|
64
61
|
}
|
|
65
|
-
debug(`For entity "%s" result filter %s`, data.entity, filter);
|
|
62
|
+
use_logger_1.Logger.debug(`For entity "%s" result filter %s`, data.entity, filter);
|
|
66
63
|
return dataService.getList(data.entity, Object.assign(Object.assign({}, data), { filter, order: (0, parse_order_1.default)(data.order) }))
|
|
67
64
|
.then(res => Promise.all(res.map(values => formatResult(data, values))));
|
|
68
65
|
/**
|