eservices-back-core 1.3.7 → 1.3.9
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 +2 -2
- package/dist/Server.d.ts.map +1 -1
- package/dist/Server.js +2 -9
- package/dist/Server.js.map +1 -1
- package/dist/errors/api-error.d.ts +1 -1
- package/dist/errors/api-error.d.ts.map +1 -1
- package/dist/errors/api-error.js +3 -0
- package/dist/errors/api-error.js.map +1 -1
- package/dist/services/criterion-service.d.ts.map +1 -1
- package/dist/services/criterion-service.js +1 -10
- package/dist/services/criterion-service.js.map +1 -1
- package/dist/socket/configuration-read-socket.d.ts +2 -0
- package/dist/socket/configuration-read-socket.d.ts.map +1 -0
- package/dist/socket/configuration-read-socket.js +18 -0
- package/dist/socket/configuration-read-socket.js.map +1 -0
- package/dist/socket/connect-socket.d.ts +12 -0
- package/dist/socket/connect-socket.d.ts.map +1 -0
- package/dist/socket/connect-socket.js +107 -0
- package/dist/socket/connect-socket.js.map +1 -0
- package/dist/socket/entity-read-socket.d.ts +8 -0
- package/dist/socket/entity-read-socket.d.ts.map +1 -0
- package/dist/socket/entity-read-socket.js +20 -0
- package/dist/socket/entity-read-socket.js.map +1 -0
- package/dist/socket/metadata-read-socket.d.ts +9 -0
- package/dist/socket/metadata-read-socket.d.ts.map +1 -0
- package/dist/socket/metadata-read-socket.js +50 -0
- package/dist/socket/metadata-read-socket.js.map +1 -0
- package/dist/socket/namespaces/default-namespace.d.ts +2 -2
- package/dist/socket/namespaces/default-namespace.d.ts.map +1 -1
- package/dist/socket/namespaces/default-namespace.js +16 -0
- package/dist/socket/namespaces/default-namespace.js.map +1 -1
- package/dist/socket/use-socket.d.ts.map +1 -1
- package/dist/socket/use-socket.js +4 -1
- package/dist/socket/use-socket.js.map +1 -1
- package/package.json +4 -3
package/dist/Server.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Express } from "express";
|
|
3
3
|
import { Server as HTTPServer } from 'http';
|
|
4
|
-
import { Server as SocketServer } from "socket.io";
|
|
5
4
|
import { ConfigParams } from "express-openid-connect";
|
|
5
|
+
import { WebSocketServer } from "ws";
|
|
6
6
|
export default class Server implements ServerOptions {
|
|
7
7
|
/**
|
|
8
8
|
* @description Ссылка на express сервер.
|
|
@@ -35,7 +35,7 @@ export default class Server implements ServerOptions {
|
|
|
35
35
|
/**
|
|
36
36
|
* @description Instance of Socket.IO server
|
|
37
37
|
*/
|
|
38
|
-
socket:
|
|
38
|
+
socket: WebSocketServer;
|
|
39
39
|
/**
|
|
40
40
|
* @description API URL(App Server)
|
|
41
41
|
*/
|
package/dist/Server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";AAAA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AACzC,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";AAAA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AACzC,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAMhD,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAGpD,OAAO,EAAC,eAAe,EAAC,MAAM,IAAI,CAAC;AAMnC,MAAM,CAAC,OAAO,OAAO,MAAO,YAAW,aAAa;IAEnD;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IACjB;;OAEG;IACH,IAAI,QAAQ,IAAI,KAAK,GAAG,KAAK,CAE5B;IAED;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,MAAM,EAAE,eAAe,CAAA;IAEvB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,IAAI,EAAE,YAAY,CAAA;IAClB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,aAAa;IAgBjC,GAAG;IAeG,eAAe,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,mBAAmB,EAAE,aAAa,CAAC,qBAAqB,CAAC;CAYlH;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,mBAavD;AAED,UAAU,aAAa;IACtB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IACf;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ;;OAEG;IACH,IAAI,EAAE,UAAU,CAAA;IAChB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,IAAI,EAAE,YAAY,CAAA;CAClB;AAED,oBAAY,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA"}
|
package/dist/Server.js
CHANGED
|
@@ -17,12 +17,11 @@ const express_1 = __importDefault(require("express"));
|
|
|
17
17
|
const http_1 = __importDefault(require("http"));
|
|
18
18
|
const use_logger_1 = __importDefault(require("./logger/use-logger"));
|
|
19
19
|
const router_1 = __importDefault(require("./router"));
|
|
20
|
-
const use_socket_1 = __importDefault(require("./socket/use-socket"));
|
|
21
20
|
const winston_1 = require("winston");
|
|
22
|
-
const socket_io_1 = require("socket.io");
|
|
23
21
|
const path_1 = __importDefault(require("path"));
|
|
24
22
|
const use_config_1 = __importDefault(require("./utils/use-config"));
|
|
25
23
|
const fs_1 = __importDefault(require("fs"));
|
|
24
|
+
const connect_socket_1 = __importDefault(require("./socket/connect-socket"));
|
|
26
25
|
let serverLink = null;
|
|
27
26
|
class Server {
|
|
28
27
|
constructor(params) {
|
|
@@ -32,15 +31,10 @@ class Server {
|
|
|
32
31
|
this.app = (0, express_1.default)();
|
|
33
32
|
this.httpServer = http_1.default.createServer(this.app);
|
|
34
33
|
this.staticDir = path_1.default.join(params.projectDir, 'static');
|
|
35
|
-
this.socket = new socket_io_1.Server(this.httpServer, {
|
|
36
|
-
cors: {
|
|
37
|
-
origin: ['http://localhost:*', `${process.env.BASE_URL}:*`],
|
|
38
|
-
credentials: true
|
|
39
|
-
}
|
|
40
|
-
});
|
|
41
34
|
if (!((_d = (_c = (_b = (_a = params.oidc) === null || _a === void 0 ? void 0 : _a.authorizationParams) === null || _b === void 0 ? void 0 : _b.scope) === null || _c === void 0 ? void 0 : _c.includes) === null || _d === void 0 ? void 0 : _d.call(_c, 'offline_access'))) {
|
|
42
35
|
console.warn('[server-warning] scope offline_access is not provided in authorizationParams.');
|
|
43
36
|
}
|
|
37
|
+
(0, connect_socket_1.default)(this);
|
|
44
38
|
}
|
|
45
39
|
/**
|
|
46
40
|
* @description Параметр идентифицирующий тип web-сервера. Используется для работы с AppServer.
|
|
@@ -84,7 +78,6 @@ function createServer(params) {
|
|
|
84
78
|
yield server.generateVersion(params.version, params.filepathBuildNumber);
|
|
85
79
|
(0, use_logger_1.default)();
|
|
86
80
|
(0, router_1.default)();
|
|
87
|
-
(0, use_socket_1.default)();
|
|
88
81
|
(0, use_config_1.default)();
|
|
89
82
|
server.run();
|
|
90
83
|
return server;
|
package/dist/Server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAAyC;AACzC,gDAAgD;AAChD,qEAA+C;AAC/C,sDAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,6 @@ export default class ApiError extends Error {
|
|
|
17
17
|
static InvalidAccess(message?: string): ApiError;
|
|
18
18
|
static UsageContextNotFounded(url: string): ApiError;
|
|
19
19
|
static UndefinedId(): ApiError;
|
|
20
|
-
static:
|
|
20
|
+
static SocketWrongEntityReadParams(): ApiError;
|
|
21
21
|
}
|
|
22
22
|
//# sourceMappingURL=api-error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-error.d.ts","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK;IAGV,MAAM,EAAE,MAAM;IAD9C,OAAO,EAAE,GAAG,CAAA;gBACA,GAAG,EAAE,MAAM,EAAS,MAAM,GAAE,MAAY,EAAE,OAAO,CAAC,EAAE,GAAG;IAInE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAG3C,MAAM,CAAC,aAAa;IAGpB;;;;OAIG;IACH,MAAM,CAAC,2BAA2B;IAIlC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG;IAGzB,MAAM,CAAC,cAAc,CAAC,OAAO,GAAE,GAAQ;IAIvC,MAAM,CAAC,wBAAwB;IAG/B,MAAM,CAAC,UAAU,CAAC,OAAO,GAAE,MAAsB;IAGjD,MAAM,CAAC,aAAa,CAAC,OAAO,GAAE,MAA0G;IAGxI,MAAM,CAAC,sBAAsB,CAAC,GAAG,EAAE,MAAM;IAGzC,MAAM,CAAC,WAAW;IAGlB,MAAM,
|
|
1
|
+
{"version":3,"file":"api-error.d.ts","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK;IAGV,MAAM,EAAE,MAAM;IAD9C,OAAO,EAAE,GAAG,CAAA;gBACA,GAAG,EAAE,MAAM,EAAS,MAAM,GAAE,MAAY,EAAE,OAAO,CAAC,EAAE,GAAG;IAInE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAG3C,MAAM,CAAC,aAAa;IAGpB;;;;OAIG;IACH,MAAM,CAAC,2BAA2B;IAIlC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG;IAGzB,MAAM,CAAC,cAAc,CAAC,OAAO,GAAE,GAAQ;IAIvC,MAAM,CAAC,wBAAwB;IAG/B,MAAM,CAAC,UAAU,CAAC,OAAO,GAAE,MAAsB;IAGjD,MAAM,CAAC,aAAa,CAAC,OAAO,GAAE,MAA0G;IAGxI,MAAM,CAAC,sBAAsB,CAAC,GAAG,EAAE,MAAM;IAGzC,MAAM,CAAC,WAAW;IAGlB,MAAM,CAAC,2BAA2B;CAGlC"}
|
package/dist/errors/api-error.js
CHANGED
|
@@ -42,6 +42,9 @@ class ApiError extends Error {
|
|
|
42
42
|
static UndefinedId() {
|
|
43
43
|
return new ApiError('Required field not specified: Id');
|
|
44
44
|
}
|
|
45
|
+
static SocketWrongEntityReadParams() {
|
|
46
|
+
return new ApiError(`When reading an entity, incorrect or incomplete parameters were passed.`);
|
|
47
|
+
}
|
|
45
48
|
}
|
|
46
49
|
exports.default = ApiError;
|
|
47
50
|
//# sourceMappingURL=api-error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-error.js","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,QAAS,SAAQ,KAAK;IAG1C,YAAY,GAAW,EAAS,SAAiB,GAAG,EAAE,OAAa;QAClE,KAAK,CAAC,GAAG,CAAC,CAAC;QADoB,WAAM,GAAN,MAAM,CAAc;QAEnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IACD,MAAM,CAAC,kBAAkB,CAAC,QAAiB;QAC1C,OAAO,IAAI,QAAQ,CAAC,qBAAqB,GAAG,QAAQ,CAAA,CAAC,CAAC,OAAO,QAAQ,GAAG,CAAA,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,CAAC,aAAa;QACnB,OAAO,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IACD;;;;OAIG;IACH,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAS;QACxB,OAAO,IAAI,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,CAAC,cAAc,CAAC,UAAe,EAAE;QACtC,OAAO,IAAI,QAAQ,CAAC;4EACsD,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC3F,CAAC;IACD,MAAM,CAAC,wBAAwB;QAC9B,OAAO,IAAI,QAAQ,CAAC,wDAAwD,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,UAAkB,aAAa;QAChD,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,aAAa,CAAC,UAAkB,iGAAiG;QACvI,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,sBAAsB,CAAC,GAAW;QACxC,OAAO,IAAI,QAAQ,CAAC,qCAAqC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,CAAC,WAAW;QACjB,OAAO,IAAI,QAAQ,CAAC,kCAAkC,CAAC,CAAA;IACxD,CAAC;
|
|
1
|
+
{"version":3,"file":"api-error.js","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,QAAS,SAAQ,KAAK;IAG1C,YAAY,GAAW,EAAS,SAAiB,GAAG,EAAE,OAAa;QAClE,KAAK,CAAC,GAAG,CAAC,CAAC;QADoB,WAAM,GAAN,MAAM,CAAc;QAEnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IACD,MAAM,CAAC,kBAAkB,CAAC,QAAiB;QAC1C,OAAO,IAAI,QAAQ,CAAC,qBAAqB,GAAG,QAAQ,CAAA,CAAC,CAAC,OAAO,QAAQ,GAAG,CAAA,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,CAAC,aAAa;QACnB,OAAO,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IACD;;;;OAIG;IACH,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAS;QACxB,OAAO,IAAI,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,CAAC,cAAc,CAAC,UAAe,EAAE;QACtC,OAAO,IAAI,QAAQ,CAAC;4EACsD,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC3F,CAAC;IACD,MAAM,CAAC,wBAAwB;QAC9B,OAAO,IAAI,QAAQ,CAAC,wDAAwD,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,UAAkB,aAAa;QAChD,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,aAAa,CAAC,UAAkB,iGAAiG;QACvI,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,sBAAsB,CAAC,GAAW;QACxC,OAAO,IAAI,QAAQ,CAAC,qCAAqC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,CAAC,WAAW;QACjB,OAAO,IAAI,QAAQ,CAAC,kCAAkC,CAAC,CAAA;IACxD,CAAC;IACD,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,yEAAyE,CAAC,CAAA;IAC/F,CAAC;CACD;AA/CD,2BA+CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-service.d.ts","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACN,cAAc,EACd,aAAa,EAAE,wBAAwB,EAAE,kBAAkB,EAAmB,0BAA0B,EACjE,wBAAwB,EAC/D,gBAAgB,EAChB,MAAM,eAAe,CAAC;AAKvB;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,OAAM;IAElC;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,OAAO;IAE9B,GAAG,CAAC,MAAM,EAAE,kBAAkB;YAetB,iBAAiB;IAyB/B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IA0E9B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;
|
|
1
|
+
{"version":3,"file":"criterion-service.d.ts","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACN,cAAc,EACd,aAAa,EAAE,wBAAwB,EAAE,kBAAkB,EAAmB,0BAA0B,EACjE,wBAAwB,EAC/D,gBAAgB,EAChB,MAAM,eAAe,CAAC;AAKvB;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,OAAM;IAElC;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,OAAO;IAE9B,GAAG,CAAC,MAAM,EAAE,kBAAkB;YAetB,iBAAiB;IAyB/B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IA0E9B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAgD7B;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAehB;;OAEG;IACH,OAAO,CAAC,aAAa;IAIrB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAatB;;OAEG;YACW,oBAAoB;IAelC;;OAEG;IACH,wBAAwB,CAAC,eAAe,EAAE,qBAAqB,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE;IA6E1G,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,iBAAiB;IAMlB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,gBAAgB;IAK3D,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,kBAAkB;IAM/D,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,GAAG,IAAI,IAAI,wBAAwB;IAGnF,mBAAmB,CAAC,IAAI,EAAE,wBAAwB,GAAG,IAAI,IAAI,0BAA0B;IAG9F;;;OAGG;IACH,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,aAAa;IAIrB;;;;;;;;OAQG;IACI,cAAc,CAAC,SAAS,EAAE,cAAc,GAAG,qBAAqB;IAOvE,OAAO,CAAC,oBAAoB;CAG5B;AAED,UAAU,kBAAkB;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,cAAc,CAAC;IAC1B;;;;;OAKG;IACH,cAAc,EAAE,YAAY,EAAE,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC3B;AACD,aAAK,qBAAqB,GAAG,aAAa,EAAE,EAAE,CAAA;AAE9C,aAAK,YAAY,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAID,aAAK,YAAY,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
|
|
@@ -150,9 +150,6 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
150
150
|
});
|
|
151
151
|
const dataService = new data_service_1.default(this.token);
|
|
152
152
|
return Promise.all(store.map(item => {
|
|
153
|
-
console.log({
|
|
154
|
-
filter: (0, Filter_1.default)(item.filters)
|
|
155
|
-
});
|
|
156
153
|
return dataService.getCount(item.entity, { filter: (0, Filter_1.default)(item.filters) });
|
|
157
154
|
})).then(result => {
|
|
158
155
|
result.forEach((data, index) => {
|
|
@@ -261,14 +258,8 @@ class CriterionService extends interface_auth_service_1.default {
|
|
|
261
258
|
fields.push((_b = equal[2]) === null || _b === void 0 ? void 0 : _b.field);
|
|
262
259
|
add(equal[0], ...fields);
|
|
263
260
|
}
|
|
264
|
-
if (this.isExpressionInclude(data.expression))
|
|
265
|
-
console.log('Found include. ');
|
|
261
|
+
if (this.isExpressionInclude(data.expression))
|
|
266
262
|
return;
|
|
267
|
-
/*
|
|
268
|
-
const include = data.expression.include;
|
|
269
|
-
add(include[0], ...Object.keys(include[1]))
|
|
270
|
-
*/
|
|
271
|
-
}
|
|
272
263
|
return;
|
|
273
264
|
}
|
|
274
265
|
console.log('[criterion-service] error to parse fields. Unknown object.', data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configuration-read-socket.d.ts","sourceRoot":"","sources":["../../src/socket/configuration-read-socket.ts"],"names":[],"mappings":"AAIA,wBAAgB,iBAAiB,QAEhC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.readConfiguration = void 0;
|
|
7
|
+
const store_1 = require("../store");
|
|
8
|
+
const Store_1 = __importDefault(require("../store/Store"));
|
|
9
|
+
const Server_1 = __importDefault(require("../Server"));
|
|
10
|
+
function readConfiguration() {
|
|
11
|
+
return getServerConfiguration();
|
|
12
|
+
}
|
|
13
|
+
exports.readConfiguration = readConfiguration;
|
|
14
|
+
function getServerConfiguration() {
|
|
15
|
+
const state = store_1.store.getState();
|
|
16
|
+
return Object.assign(Object.assign({}, state.webServerConfiguration), { navigation: Store_1.default.viewNavigation, notification: Store_1.default.viewNotification, version: Server_1.default.getServer().version });
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=configuration-read-socket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configuration-read-socket.js","sourceRoot":"","sources":["../../src/socket/configuration-read-socket.ts"],"names":[],"mappings":";;;;;;AAAA,oCAA+B;AAC/B,2DAAmC;AACnC,uDAA+B;AAE/B,SAAgB,iBAAiB;IAChC,OAAO,sBAAsB,EAAE,CAAC;AACjC,CAAC;AAFD,8CAEC;AAED,SAAS,sBAAsB;IAC9B,MAAM,KAAK,GAAG,aAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,uCACI,KAAK,CAAC,sBAAsB,KAC/B,UAAU,EAAE,eAAK,CAAC,cAAc,EAChC,YAAY,EAAE,eAAK,CAAC,gBAAgB,EACpC,OAAO,EAAE,gBAAM,CAAC,SAAS,EAAE,CAAC,OAAO,IACnC;AACF,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import Server from "../Server";
|
|
2
|
+
/**
|
|
3
|
+
* @description Метод используется для присоединения сокета к HTTP серверу. Также добавляются простые обработчики для
|
|
4
|
+
* чтения данных и т.д.
|
|
5
|
+
*/
|
|
6
|
+
export default function connectSocket(webServer: Server): void;
|
|
7
|
+
export interface ISocketOptions {
|
|
8
|
+
token: string;
|
|
9
|
+
usageContext: string;
|
|
10
|
+
contextId: number;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=connect-socket.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,WAAW,CAAC;AAY/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QA6EtD;AAgBD,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CACjB"}
|
|
@@ -0,0 +1,107 @@
|
|
|
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
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const ws_1 = require("ws");
|
|
16
|
+
const auth_middleware_1 = __importDefault(require("../middleware/auth-middleware"));
|
|
17
|
+
const entity_read_socket_1 = require("./entity-read-socket");
|
|
18
|
+
const get_usage_context_1 = __importDefault(require("../utils/get-usage-context"));
|
|
19
|
+
const metadata_read_socket_1 = require("./metadata-read-socket");
|
|
20
|
+
const configuration_read_socket_1 = require("./configuration-read-socket");
|
|
21
|
+
function onSocketError(err) {
|
|
22
|
+
console.error(err);
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* @description Метод используется для присоединения сокета к HTTP серверу. Также добавляются простые обработчики для
|
|
26
|
+
* чтения данных и т.д.
|
|
27
|
+
*/
|
|
28
|
+
function connectSocket(webServer) {
|
|
29
|
+
const httpServer = webServer.httpServer;
|
|
30
|
+
const socketServer = webServer.socket = new ws_1.WebSocket.Server({
|
|
31
|
+
noServer: true
|
|
32
|
+
})
|
|
33
|
+
.on('connection', function connection(ws, req) {
|
|
34
|
+
sendResponse(ws, 'configuration:read', 0, (0, configuration_read_socket_1.readConfiguration)());
|
|
35
|
+
ws.on('error', console.error);
|
|
36
|
+
ws.on('message', function message(stringData) {
|
|
37
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
38
|
+
const info = JSON.parse(stringData);
|
|
39
|
+
const options = {
|
|
40
|
+
token: req.__token,
|
|
41
|
+
usageContext: (0, get_usage_context_1.default)(info.url),
|
|
42
|
+
contextId: info.contextId
|
|
43
|
+
};
|
|
44
|
+
const sendResult = wrapResponse(ws, info.requestId, info.event);
|
|
45
|
+
try {
|
|
46
|
+
switch (info.event) {
|
|
47
|
+
case 'entity:read': {
|
|
48
|
+
sendResult(yield (0, entity_read_socket_1.readEntitySocket)(options, info.data));
|
|
49
|
+
break;
|
|
50
|
+
}
|
|
51
|
+
case 'metadata:read': {
|
|
52
|
+
sendResult(yield (0, metadata_read_socket_1.readMetadata)(options, info.data));
|
|
53
|
+
break;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
catch (err) {
|
|
58
|
+
console.log(err);
|
|
59
|
+
sendResponse(ws, 'request-error', info.requestId, err);
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
httpServer.on('upgrade', function upgrade(request, socket, head) {
|
|
65
|
+
socket.on('error', onSocketError);
|
|
66
|
+
/**
|
|
67
|
+
* @description Фиктивная обёртка для authMiddleware. Т.к. в middleware происходит получение cookie, а в
|
|
68
|
+
* request нет метода get, которым пользуется middleware - добавляем ложный метод.
|
|
69
|
+
*/
|
|
70
|
+
request.get = function dummyGetHeaders(name) {
|
|
71
|
+
return request.headers[name];
|
|
72
|
+
};
|
|
73
|
+
try {
|
|
74
|
+
// @ts-ignore
|
|
75
|
+
(0, auth_middleware_1.default)()(request, {}, function next(err) {
|
|
76
|
+
if (err) {
|
|
77
|
+
socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
|
|
78
|
+
socket.destroy();
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
socket.removeListener('error', onSocketError);
|
|
82
|
+
const accessToken = request.oidc.accessToken;
|
|
83
|
+
request.__token = `${accessToken.token_type} ${accessToken.access_token}`;
|
|
84
|
+
socketServer.handleUpgrade(request, socket, head, function done(ws) {
|
|
85
|
+
socketServer.emit('connection', ws, request);
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
catch (e) {
|
|
90
|
+
console.log('Socket error', e);
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
exports.default = connectSocket;
|
|
95
|
+
function wrapResponse(ws, requestId, defaultEvent) {
|
|
96
|
+
return (response, event) => {
|
|
97
|
+
sendResponse(ws, event || defaultEvent, requestId, response);
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
function sendResponse(ws, event, requestId, response) {
|
|
101
|
+
ws.send(JSON.stringify({
|
|
102
|
+
event,
|
|
103
|
+
data: response,
|
|
104
|
+
requestId
|
|
105
|
+
}));
|
|
106
|
+
}
|
|
107
|
+
//# sourceMappingURL=connect-socket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ISocketOptions } from "./connect-socket";
|
|
2
|
+
export declare function readEntitySocket(options: ISocketOptions, data: unknown): Promise<{}>;
|
|
3
|
+
export interface IEntityReadParams {
|
|
4
|
+
entity: string;
|
|
5
|
+
id?: string;
|
|
6
|
+
fields?: string;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=entity-read-socket.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entity-read-socket.d.ts","sourceRoot":"","sources":["../../src/socket/entity-read-socket.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAGhD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,eAOtE;AAOD,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;CACf"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.readEntitySocket = void 0;
|
|
7
|
+
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
8
|
+
const data_service_1 = __importDefault(require("../services/data-service"));
|
|
9
|
+
function readEntitySocket(options, data) {
|
|
10
|
+
if (!isEntityReadParams(data))
|
|
11
|
+
throw api_error_1.default.SocketWrongEntityReadParams();
|
|
12
|
+
const dataService = new data_service_1.default(options.token);
|
|
13
|
+
if (data.id)
|
|
14
|
+
return dataService.getById(data.entity, data.id, { fields: data.fields });
|
|
15
|
+
return dataService.getList(data.entity, { fields: data.fields });
|
|
16
|
+
}
|
|
17
|
+
exports.readEntitySocket = readEntitySocket;
|
|
18
|
+
const isEntityReadParams = (value) => !!value && typeof value === 'object' &&
|
|
19
|
+
'entity' in value && typeof value.entity === 'string';
|
|
20
|
+
//# sourceMappingURL=entity-read-socket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entity-read-socket.js","sourceRoot":"","sources":["../../src/socket/entity-read-socket.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA2C;AAE3C,4EAAmD;AAEnD,SAAgB,gBAAgB,CAAC,OAAuB,EAAE,IAAa;IACtE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;QAAE,MAAM,mBAAQ,CAAC,2BAA2B,EAAE,CAAC;IAE5E,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEnD,IAAI,IAAI,CAAC,EAAE;QAAE,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;IACrF,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAA;AAC/D,CAAC;AAPD,4CAOC;AAED,MAAM,kBAAkB,GAAG,CAAC,KAAc,EACd,EAAE,CAC7B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA2B,CAAC,MAAM,KAAK,QAAQ,CAAA"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { ISocketOptions } from "./connect-socket";
|
|
2
|
+
export declare function readMetadata(options: ISocketOptions, data: unknown): Promise<import("../types/main").MetadataResponse>;
|
|
3
|
+
export interface IMetadataReadParams {
|
|
4
|
+
entity: string;
|
|
5
|
+
id?: number;
|
|
6
|
+
type?: string;
|
|
7
|
+
masterEntities?: [string, number][];
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=metadata-read-socket.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadata-read-socket.d.ts","sourceRoot":"","sources":["../../src/socket/metadata-read-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAMhD,wBAAsB,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,qDAyBxE;AAOD,MAAM,WAAW,mBAAmB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CACnC"}
|
|
@@ -0,0 +1,50 @@
|
|
|
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
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.readMetadata = void 0;
|
|
16
|
+
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
17
|
+
const metadata_service_1 = __importDefault(require("../services/metadata-service"));
|
|
18
|
+
const criterion_service_1 = __importDefault(require("../services/criterion-service"));
|
|
19
|
+
const Store_1 = __importDefault(require("../store/Store"));
|
|
20
|
+
function readMetadata(options, data) {
|
|
21
|
+
var _a;
|
|
22
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
+
if (!isMetadataReadParams(data))
|
|
24
|
+
throw api_error_1.default.SocketWrongEntityReadParams();
|
|
25
|
+
// Установка значения по умолчанию
|
|
26
|
+
if (!data.type)
|
|
27
|
+
data.type = 'criterion';
|
|
28
|
+
const criterionService = new criterion_service_1.default(options.token);
|
|
29
|
+
const criterionConfig = ((_a = Store_1.default.getMetadataSettingsForEntity(data.entity)) === null || _a === void 0 ? void 0 : _a[data.type]) ||
|
|
30
|
+
((yield metadata_service_1.default.checkFieldInEntity(data.entity, 'StatusCode')) ? ["StatusCode"] : []);
|
|
31
|
+
const criterion = yield criterionService.get({
|
|
32
|
+
entity: data.entity,
|
|
33
|
+
id: data.id,
|
|
34
|
+
criterion: criterionConfig,
|
|
35
|
+
preset: {
|
|
36
|
+
currentContextId: options.contextId
|
|
37
|
+
},
|
|
38
|
+
masterEntities: data.masterEntities
|
|
39
|
+
});
|
|
40
|
+
const metadataService = new metadata_service_1.default(options.token);
|
|
41
|
+
const metadata = yield metadataService.getFull(data.entity, criterion, options.usageContext);
|
|
42
|
+
if (data.id)
|
|
43
|
+
metadata.metadataByEntityId = data.id;
|
|
44
|
+
return metadata;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
exports.readMetadata = readMetadata;
|
|
48
|
+
const isMetadataReadParams = (value) => !!value && typeof value === 'object' &&
|
|
49
|
+
'entity' in value && typeof value.entity === 'string';
|
|
50
|
+
//# sourceMappingURL=metadata-read-socket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metadata-read-socket.js","sourceRoot":"","sources":["../../src/socket/metadata-read-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,oEAA2C;AAC3C,oFAA2D;AAC3D,sFAA6D;AAC7D,2DAAmC;AAEnC,SAAsB,YAAY,CAAC,OAAuB,EAAE,IAAa;;;QACxE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,2BAA2B,EAAE,CAAC;QAE9E,kCAAkC;QAClC,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;QAExC,MAAM,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,CAAA,MAAA,eAAK,CAAC,4BAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,0CAAG,IAAI,CAAC,IAAI,CAAC;YACnF,CAAC,CAAA,MAAM,0BAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,EAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAC5F,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC;YAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,SAAS,EAAE,eAAe;YAC1B,MAAM,EAAE;gBACP,gBAAgB,EAAE,OAAO,CAAC,SAAS;aACnC;YACD,cAAc,EAAE,IAAI,CAAC,cAAc;SACnC,CAAC,CAAA;QAGF,MAAM,eAAe,GAAG,IAAI,0BAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7F,IAAI,IAAI,CAAC,EAAE;YAAE,QAAQ,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE,CAAC;QACnD,OAAO,QAAQ,CAAA;;CACf;AAzBD,oCAyBC;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,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Namespace } from "socket.io";
|
|
2
|
-
declare const _default: (io: Namespace) => void;
|
|
1
|
+
import { Namespace, Server as SocketServer } from "socket.io";
|
|
2
|
+
declare const _default: (io: Namespace | SocketServer) => void;
|
|
3
3
|
export default _default;
|
|
4
4
|
//# sourceMappingURL=default-namespace.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-namespace.d.ts","sourceRoot":"","sources":["../../../src/socket/namespaces/default-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"default-namespace.d.ts","sourceRoot":"","sources":["../../../src/socket/namespaces/default-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,MAAM,IAAI,YAAY,EAAC,MAAM,WAAW,CAAC;6BASxC,SAAS,GAAG,YAAY;AAA5C,wBAiGC"}
|
|
@@ -22,6 +22,7 @@ const Store_1 = __importDefault(require("../../store/Store"));
|
|
|
22
22
|
exports.default = (io) => {
|
|
23
23
|
const socketLogger = winston_1.loggers.get('socket');
|
|
24
24
|
io.on('connection', socket => {
|
|
25
|
+
console.log('++');
|
|
25
26
|
socket.on('entity:read', ({ entity, fields, referer }, callback) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
27
|
try {
|
|
27
28
|
// @ts-ignore
|
|
@@ -77,13 +78,16 @@ exports.default = (io) => {
|
|
|
77
78
|
}
|
|
78
79
|
}));
|
|
79
80
|
socket.on("error", err => {
|
|
81
|
+
console.log('Socket error', err);
|
|
80
82
|
socketLogger.error(err);
|
|
81
83
|
});
|
|
82
84
|
socket.on("disconnect", err => {
|
|
85
|
+
console.log('--');
|
|
83
86
|
socketLogger.error(err);
|
|
84
87
|
});
|
|
85
88
|
socket.on("server-configuration:read", () => {
|
|
86
89
|
try {
|
|
90
|
+
console.log('++++');
|
|
87
91
|
socket.emit("server-configuration:update", getServerConfiguration());
|
|
88
92
|
}
|
|
89
93
|
catch (e) {
|
|
@@ -91,6 +95,18 @@ exports.default = (io) => {
|
|
|
91
95
|
}
|
|
92
96
|
});
|
|
93
97
|
socket.emit("server-configuration:update", getServerConfiguration());
|
|
98
|
+
socket.on('version', () => {
|
|
99
|
+
try {
|
|
100
|
+
console.log('++++');
|
|
101
|
+
socket.emit("version", Server_1.default.getServer().version);
|
|
102
|
+
}
|
|
103
|
+
catch (e) {
|
|
104
|
+
socketLogger.error(e);
|
|
105
|
+
}
|
|
106
|
+
});
|
|
107
|
+
socket.on("disconnect", (reason) => {
|
|
108
|
+
console.log('Disconnect reason', reason);
|
|
109
|
+
});
|
|
94
110
|
});
|
|
95
111
|
};
|
|
96
112
|
function getServerConfiguration() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-namespace.js","sourceRoot":"","sources":["../../../src/socket/namespaces/default-namespace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,+EAAsD;AACtD,qCAAgC;AAChC,uFAA8D;AAC9D,sFAA4D;AAC5D,0DAAkC;AAClC,uCAAkC;AAClC,8DAAsC;AAEtC,kBAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"default-namespace.js","sourceRoot":"","sources":["../../../src/socket/namespaces/default-namespace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-socket.d.ts","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,SAAS,
|
|
1
|
+
{"version":3,"file":"use-socket.d.ts","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,SAAS,SAYhC"}
|
|
@@ -10,9 +10,12 @@ const Server_1 = __importDefault(require("../Server"));
|
|
|
10
10
|
const wrap = middleware => (socket, next) => middleware(socket.request, {}, next);
|
|
11
11
|
function useSocket() {
|
|
12
12
|
const io = Server_1.default.getServer().socket;
|
|
13
|
-
(0, default_namespace_1.default)(io
|
|
13
|
+
(0, default_namespace_1.default)(io
|
|
14
14
|
.use(wrap(session_middleware_1.default))
|
|
15
15
|
.use(wrap(authSocketMiddleware)));
|
|
16
|
+
setInterval(() => {
|
|
17
|
+
console.log(`Count connected users ${io.engine.clientsCount}.`);
|
|
18
|
+
}, 2000);
|
|
16
19
|
}
|
|
17
20
|
exports.default = useSocket;
|
|
18
21
|
function authSocketMiddleware(req, res, next) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-socket.js","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":";;;;;AAAA,0FAAiE;AACjE,uFAA8D;AAE9D,oEAA2C;AAC3C,uDAA+B;AAE/B,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;AAElF,SAAwB,SAAS;IAChC,MAAM,EAAE,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC;IAErC,IAAA,2BAAgB,EACf,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"use-socket.js","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":";;;;;AAAA,0FAAiE;AACjE,uFAA8D;AAE9D,oEAA2C;AAC3C,uDAA+B;AAE/B,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;AAElF,SAAwB,SAAS;IAChC,MAAM,EAAE,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC;IAErC,IAAA,2BAAgB,EACf,EAAE;SACD,GAAG,CAAC,IAAI,CAAC,4BAAiB,CAAC,CAAC;SAC5B,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAChC,CAAC;IAEF,WAAW,CAAC,GAAG,EAAE;QAChB,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC;IACjE,CAAC,EAAE,IAAI,CAAC,CAAC;AACV,CAAC;AAZD,4BAYC;AAED,SAAS,oBAAoB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;IAC9D,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,IAAI,EAAE,CAAC;IAEtC,IAAI,CAAC,mBAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,CAAC;AACpD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "eservices-back-core",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.9",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/Server.js",
|
|
6
6
|
"scripts": {
|
|
@@ -45,11 +45,12 @@
|
|
|
45
45
|
"password": "^0.1.1",
|
|
46
46
|
"redis": "^4.1.0",
|
|
47
47
|
"redux": "^4.2.0",
|
|
48
|
-
"socket.io": "^4.
|
|
48
|
+
"socket.io": "^4.7.2",
|
|
49
49
|
"ts-node": "^10.8.1",
|
|
50
50
|
"uuid": "^8.3.2",
|
|
51
51
|
"vitepress": "^1.0.0-alpha.45",
|
|
52
|
-
"winston": "^3.8.1"
|
|
52
|
+
"winston": "^3.8.1",
|
|
53
|
+
"ws": "^8.14.2"
|
|
53
54
|
},
|
|
54
55
|
"devDependencies": {
|
|
55
56
|
"@types/express": "^4.17.13",
|