eservices-back-core 1.3.18 → 1.3.19

package/dist/Server.d.ts

@@ -2,7 +2,7 @@
 import { Express } from "express";
 import { Server as HTTPServer } from 'http';
 import { ConfigParams } from "express-openid-connect";
-import { WebSocketServer } from "ws";
+import CoreSocketServer from "./socket/core-socket-server";
 export default class Server implements Omit<ServerOptions, "amqp"> {
     /**
      * @description Ссылка на express сервер.
@@ -33,9 +33,9 @@ export default class Server implements Omit<ServerOptions, "amqp"> {
      */
     staticDir: string;
     /**
-     * @description Instance of Socket.IO server
+     * @description Instance of WebSocketServer с модификациями
      */
-    socket: WebSocketServer;
+    socket: CoreSocketServer;
     /**
      * @description API URL(App Server)
      */
@@ -112,7 +112,12 @@ export interface ServerOptions {
          * @description Строковое значение префикса для названия queue.
          */
         prefix?: string;
+        /**
+         * @description Название Exchange к которому будет собачиться наша очередь
+         */
+        exchange: string;
     };
 }
 export declare type ServerType = 'back' | 'front';
+export declare type UserId = number;
 //# sourceMappingURL=Server.d.ts.map

package/dist/Server.d.ts.map

@@ -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;AAMhD,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAGpD,OAAO,EAAC,eAAe,EAAC,MAAM,IAAI,CAAC;AAOnC,MAAM,CAAC,OAAO,OAAO,MAAO,YAAW,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC;IAEjE;;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;IAiBjC,GAAG;IAcG,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,MAAM,WAAW,aAAa;IAC7B;;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,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE;QACL;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB;;;;WAIG;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB;;WAEG;QACH,MAAM,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;CACD;AAED,oBAAY,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA"}
+{"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;AAOpD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAI3D,MAAM,CAAC,OAAO,OAAO,MAAO,YAAW,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC;IAEjE;;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,gBAAgB,CAAA;IAExB;;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;IAoBjC,GAAG;IAcG,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,MAAM,WAAW,aAAa;IAC7B;;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,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE;QACL;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB;;;;WAIG;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB;;WAEG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;WAEG;QACH,QAAQ,EAAE,MAAM,CAAA;KAChB,CAAA;CACD;AAED,oBAAY,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA;AACzC,oBAAY,MAAM,GAAG,MAAM,CAAA"}

package/dist/Server.js

@@ -29,6 +29,7 @@ class Server {
         var _a, _b, _c, _d;
         serverLink = this;
         Object.assign(this, params);
+        (0, use_logger_1.default)();
         this.app = (0, express_1.default)();
         this.httpServer = http_1.default.createServer(this.app);
         this.staticDir = path_1.default.join(params.projectDir, 'static');
@@ -78,7 +79,6 @@ function createServer(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const server = new Server(params);
         yield server.generateVersion(params.version, params.filepathBuildNumber);
-        (0, use_logger_1.default)();
         (0, router_1.default)();
         (0, use_config_1.default)();
         server.run();

package/dist/Server.js.map

@@ -1 +1 @@
-{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAAyC;AACzC,gDAAgD;AAChD,qEAA+C;AAC/C,sDAAoC;AACpC,qCAAgC;AAChC,gDAAwB;AACxB,oEAA2C;AAE3C,4CAAoB;AACpB,6EAAoD;AAIpD,+EAAsD;AAGtD,IAAI,UAAU,GAAG,IAAI,CAAC;AAEtB,MAAqB,MAAM;IA+D1B,YAAY,MAAqB;;QAChC,UAAU,GAAG,IAAI,CAAC;QAClB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC5B,IAAA,oBAAS,GAAE,CAAC;QAEZ,IAAI,CAAC,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,cAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAExD,IAAI,CAAC,CAAA,MAAA,MAAA,MAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,mBAAmB,0CAAE,KAAK,0CAAE,QAAQ,mDAAG,gBAAgB,CAAC,CAAA,EAAE;YAC3E,OAAO,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAA;SAC7F;QAID,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC;QACpB,IAAA,wBAAa,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAElC,CAAC;IAjED;;OAEG;IACH,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;IAC7C,CAAC;IAuCD,MAAM,CAAC,SAAS;QACf,OAAO,UAAU,CAAC;IACnB,CAAC;IAqBD,GAAG;QACF,MAAM,UAAU,GAAG,iBAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAEtC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;YACtC,UAAU,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,YAAY,IAAI,CAAC,IAAI,OAAO,CAAC,CAAA;QAClE,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;YACjC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACtB,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE;YAC/B,UAAU,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAA;IACH,CAAC;IAEK,eAAe,CAAC,OAAiC,EAAE,mBAAyD;;YACjH,MAAM,WAAW,GAAG,mBAAmB;gBACtC,CAAC,CAAC,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;oBAClF,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;oBACrD,OAAO,GAAG,CAAA;gBACX,CAAC,CAAC;gBACF,CAAC,CAAC,GAAG,CAAC;YACP,IAAI,CAAC,OAAO,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAE5D,OAAO,IAAI,CAAC,OAAO,CAAC;QACrB,CAAC;KAAA;CACD;AA7GD,yBA6GC;AAED,SAAsB,YAAY,CAAC,MAAqB;;QAEvD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAIzE,IAAA,gBAAS,GAAE,CAAC;QACZ,IAAA,oBAAS,GAAE,CAAC;QAEZ,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,OAAO,MAAM,CAAC;IAEf,CAAC;CAAA;AAbD,oCAaC"}

package/dist/app.js

@@ -34,10 +34,11 @@ console.log(`For retoken http://localhost:${process.env.PORT}/test-api/re-token`
         },
     },
     amqp: {
-        vhost: "ar-aiti-front",
+        vhost: "ar-aiti-dev",
         username: "ws",
         password: "admin",
-        hostname: "104.41.213.67"
+        hostname: "104.41.213.67",
+        exchange: "AppRegister.Features.Notifications:DisplayMessageCreated"
     }
 });
 //# sourceMappingURL=app.js.map

package/dist/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;AAAA,qCAAsC;AAEtC,gDAAwB;AAExB,mCAA8C;AAE9C,IAAA,eAAY,EAAC;IACZ,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC;CACxC,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,CAAC,GAAG,CAAC,IAAI,oBAAoB,CAAC,CAAA;AAEjF,IAAA,qBAAY,EAAC;IACZ,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAwB;IAC1C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;IAC3B,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC;IACtC,WAAW,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC;IACtD,IAAI,EAAE;QACL,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;QACrC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC7B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QACpC,MAAM,EACL,qEAAqE;QACtE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;QACrC,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE;YACP,KAAK,EAAE,KAAK;SACZ;QACD,mBAAmB,EAAE;YACpB,aAAa,EAAE,MAAM;YACrB,KAAK,EAAE,+BAA+B;SACtC;KACD;IACD,IAAI,EAAE;QACL,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,OAAO;QACjB,QAAQ,EAAE,eAAe;KACzB;CACD,CAAC,CAAA"}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;AAAA,qCAAsC;AAEtC,gDAAwB;AAExB,mCAA8C;AAE9C,IAAA,eAAY,EAAC;IACZ,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC;CACxC,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,CAAC,GAAG,CAAC,IAAI,oBAAoB,CAAC,CAAA;AAEjF,IAAA,qBAAY,EAAC;IACZ,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAwB;IAC1C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;IAC3B,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC;IACtC,WAAW,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC;IACtD,IAAI,EAAE;QACL,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;QACrC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC7B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QACpC,MAAM,EACL,qEAAqE;QACtE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;QACrC,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE;YACP,KAAK,EAAE,KAAK;SACZ;QACD,mBAAmB,EAAE;YACpB,aAAa,EAAE,MAAM;YACrB,KAAK,EAAE,+BAA+B;SACtC;KACD;IACD,IAAI,EAAE;QACL,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,OAAO;QACjB,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,0DAA0D;KACpE;CACD,CAAC,CAAA"}

package/dist/logger/use-logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-logger.d.ts","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":"AAoBA,MAAM,CAAC,OAAO,UAAU,SAAS,SA6BhC"}
+{"version":3,"file":"use-logger.d.ts","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAC,OAAO,UAAU,SAAS,SAmBhC"}

package/dist/logger/use-logger.js

@@ -37,15 +37,6 @@ function useLogger() {
         if (typeof data === "string")
             addLogger(data);
     });
-    /*
-    addLogger('socket');
-    addLogger('metadata');
-    addLogger('context');
-    addLogger('main');
-    addLogger('error');
-    addLogger('tokens');
-    addLogger('request');
-*/
 }
 exports.default = useLogger;
 //# sourceMappingURL=use-logger.js.map

package/dist/logger/use-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,uDAA+B;AAC/B,qCAAoD;AAGpD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,cAAI,CAAC,IAAI,CAAC,gBAAM,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;AAC3E,CAAC;AACD,SAAS,SAAS,CAAC,IAAY;IAC3B,iBAAO,CAAC,GAAG,CAAC,IAAI,EAAE;QACd,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,WAAW,EAAE,CACvB;QACD,UAAU,EAAE;YACR,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,EAAC,CAAC;SACrD;KACJ,CAAC,CAAA;AACN,CAAC;AAED,SAAwB,SAAS;IAE7B,MAAM,MAAM,GAAG;QACX,QAAQ;QACR,UAAU;QACV,SAAS;QACT,MAAM;QACN,OAAO;QACP,QAAQ;QACR,SAAS;QACT,aAAa;QACb,cAAc;QACd,gBAAgB;QAChB,OAAO;QACP,SAAS;QACT,WAAW;KACd,CAAA;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAClB,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAA;IACF;;;;;;;;EAQF;AACF,CAAC;AA7BD,4BA6BC"}
+{"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,uDAA+B;AAC/B,qCAAoD;AAEpD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,cAAI,CAAC,IAAI,CAAC,gBAAM,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;AAC3E,CAAC;AACD,SAAS,SAAS,CAAC,IAAY;IAC3B,iBAAO,CAAC,GAAG,CAAC,IAAI,EAAE;QACd,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,WAAW,EAAE,CACvB;QACD,UAAU,EAAE;YACR,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,EAAC,CAAC;SACrD;KACJ,CAAC,CAAA;AACN,CAAC;AAED,SAAwB,SAAS;IAC7B,MAAM,MAAM,GAAG;QACX,QAAQ;QACR,UAAU;QACV,SAAS;QACT,MAAM;QACN,OAAO;QACP,QAAQ;QACR,SAAS;QACT,aAAa;QACb,cAAc;QACd,gBAAgB;QAChB,OAAO;QACP,SAAS;QACT,WAAW;KACd,CAAA;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAClB,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAA;AACN,CAAC;AAnBD,4BAmBC"}

package/dist/rabbitmq/connect-rabbit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect-rabbit.d.ts","sourceRoot":"","sources":["../../src/rabbitmq/connect-rabbit.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,EAAE,EAAC,aAAa,EAAC,MAAM,WAAW,CAAC;AAIhD;;;GAGG;AACH,wBAA8B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,iBA+FzF"}
+{"version":3,"file":"connect-rabbit.d.ts","sourceRoot":"","sources":["../../src/rabbitmq/connect-rabbit.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,EAAE,EAAC,aAAa,EAAC,MAAM,WAAW,CAAC;AAIhD;;;GAGG;AACH,wBAA8B,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,iBA4EzF"}

package/dist/rabbitmq/connect-rabbit.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const amqplib_1 = __importDefault(require("amqplib"));
-const Server_1 = __importDefault(require("../Server"));
 const connect_socket_1 = require("../socket/connect-socket");
 const winston_1 = require("winston");
 /**
@@ -22,58 +21,42 @@ const winston_1 = require("winston");
  */
 function connectRabbit(server, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('AMQP options', options);
+        let connectionStatus = 'closed';
         let connection;
+        const queue = [(options.prefix || "UNKNOWN"), "WS", "Events"].join('.');
+        const exchange = options.exchange;
+        const logger = winston_1.loggers.get('main');
+        console.log('AMQP options', options);
+        tryConnection();
         function startConnection() {
             return __awaiter(this, void 0, void 0, function* () {
-                const mainLogger = winston_1.loggers.get('main');
-                mainLogger.info("Start connection to Rabbit.");
+                if (connectionStatus === 'connecting')
+                    return;
+                connectionStatus = 'connecting';
+                logger.info("Start connection to Rabbit.");
                 connection = yield amqplib_1.default.connect(options);
-                connection.on('close', () => {
-                    mainLogger.info('Connection to Rabbit was closed.');
-                    tryConnection();
-                });
-                connection.on('error', (err) => {
-                    mainLogger.info('Connection to Rabbit has error.');
-                    tryConnection();
-                });
-                mainLogger.info("Connection to RabbitMQ was created!", options);
+                connectionStatus = 'connected';
+                logger.info("Connection to RabbitMQ was created!", options);
+                connection.on('close', handleCloseConnection);
+                connection.on('error', handleCloseConnection);
                 const channel = yield connection.createChannel();
-                const queue = [(options.prefix || "UNKNOWN"), "WS", "Events"].join('.');
-                const exchange = "AppRegister.Features.Notifications:DisplayMessageCreated";
-                yield channel.assertQueue(queue, {
-                    durable: false
-                }).then(ok => channel.bindQueue(ok.queue, exchange, ""));
+                yield channel.assertQueue(queue, { durable: false })
+                    .then(ok => channel.bindQueue(ok.queue, exchange, ""));
                 channel.consume(queue, handleMessage, { noAck: true });
             });
         }
+        /**
+         * @description Функция для подключения к RabbitMQ. В случаи неудачи вызывается переподключение.
+         */
         function tryConnection() {
-            setTimeout(() => {
-                startConnection()
-                    .catch(err => {
-                    console.log('Rabbit is not connect');
-                    try {
-                        Server_1.default.getServer().socket.sockets.forEach(ws => {
-                            (0, connect_socket_1.sendWSResponse)(ws, 'info', {
-                                message: 'RMQ is not connected'
-                            });
-                        });
-                    }
-                    catch (e) {
-                        //
-                    }
-                    tryConnection();
-                });
-            }, 2000);
+            setTimeout(() => startConnection().catch(tryConnection), 2000);
         }
-        tryConnection();
         function getPayload(data) {
             if (data.content)
                 return JSON.parse(data.content.toString());
             throw new Error("Where is payload in rabbit message?");
         }
         function handleMessage(data) {
-            const logger = winston_1.loggers.get("main");
             try {
                 if (!isMessage(data))
                     throw new Error('Is not correct Rabbit Message');
@@ -84,9 +67,8 @@ function connectRabbit(server, options) {
                 const message = payload.message.body;
                 const subject = payload.message.subject;
                 const arrayUsers = Array.isArray(userId) ? userId : [userId];
-                console.log(payload);
                 arrayUsers.forEach(id => {
-                    const set = server.socket._getClients(typeof id === 'number' ? id : parseInt(id, 10));
+                    const set = server.socket.getByClientId(typeof id === 'number' ? id : parseInt(id, 10));
                     set.forEach(ws => {
                         if (!ws)
                             return;
@@ -95,15 +77,16 @@ function connectRabbit(server, options) {
                 });
             }
             catch (e) {
-                // @ts-ignore
-                console.log(data.content.toString());
-                logger.info(e === null || e === void 0 ? void 0 : e.message);
+                logger.error(e === null || e === void 0 ? void 0 : e.message);
             }
         }
+        function handleCloseConnection(err) {
+            logger.error('Connection was closed or error: ' + (err === null || err === void 0 ? void 0 : err.message));
+            tryConnection();
+        }
     });
 }
 exports.default = connectRabbit;
-function handleConnectionError() { }
 const isMessage = (data) => !!data && typeof data === "object" && ('content' in data || 'message' in data);
 const isMessagePayload = (data) => !!data && typeof data === "object" && 'message' in data && typeof data.message === 'object';
 //# sourceMappingURL=connect-rabbit.js.map

package/dist/rabbitmq/connect-rabbit.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-rabbit.js","sourceRoot":"","sources":["../../src/rabbitmq/connect-rabbit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connect-rabbit.js","sourceRoot":"","sources":["../../src/rabbitmq/connect-rabbit.ts"],"names":[],"mappings":"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"}

package/dist/router/close/test-close-router.js

@@ -40,9 +40,11 @@ exports.default = () => {
     });
     TestCloseRouter.get('/sockets', (req, res, next) => {
         try {
-            const sockets = Server_1.default.getServer().socket._getAll();
+            const sockets = Server_1.default.getServer().socket.getAllSockets();
             res.json(sockets.reduce((acc, item) => {
-                acc[item[0]] = [...item[1].values()];
+                if (!acc[item.userId])
+                    acc[item.userId] = [];
+                acc[item.userId].push(item.id);
                 return acc;
             }, {}));
         }
@@ -56,8 +58,7 @@ exports.default = () => {
             if (typeof message !== 'string')
                 message = "No message";
             const userId = parseInt(req.query.userId, 10);
-            const set = Server_1.default.getServer().socket._getClients(userId);
-            console.log(set);
+            const set = Server_1.default.getServer().socket.getByClientId(userId);
             if (!set)
                 return res.json({
                     message: "Not connected user"

package/dist/router/close/test-close-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"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"}

package/dist/socket/connect-socket.d.ts

@@ -1,4 +1,4 @@
-import { WebSocket } from 'ws';
+import { WebSocket } from "ws";
 import Server from "../Server";
 /**
  * @description Метод используется для присоединения сокета к HTTP серверу. Также добавляются простые обработчики для

package/dist/socket/connect-socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AAgB/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QAuHtD;AAQD,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG;AAED,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CACjB"}
+{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AAY/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QAkGtD;AAeD,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG;AAED,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CACjB"}

package/dist/socket/connect-socket.js

@@ -13,41 +13,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendWSResponse = void 0;
-const ws_1 = require("ws");
 const auth_middleware_1 = __importDefault(require("../middleware/auth-middleware"));
 const entity_read_socket_1 = require("./entity-read-socket");
 const get_usage_context_1 = __importDefault(require("../utils/get-usage-context"));
 const metadata_read_socket_1 = require("./metadata-read-socket");
 const configuration_read_socket_1 = require("./configuration-read-socket");
-const uuid_1 = require("uuid");
 const api_error_1 = __importDefault(require("../errors/api-error"));
 const entity_count_socket_1 = require("./entity-count-socket");
-function onSocketError(err) {
-    console.error(err);
-}
+const winston_1 = require("winston");
+const core_socket_server_1 = __importDefault(require("./core-socket-server"));
 /**
  * @description Метод используется для присоединения сокета к HTTP серверу. Также добавляются простые обработчики для
  * чтения данных и т.д.
  */
 function connectSocket(webServer) {
-    const socketStore = new Map();
-    const socketClients = new Map();
-    const httpServer = webServer.httpServer;
-    const socketServer = webServer.socket = new ws_1.WebSocket.Server({
-        noServer: true
+    const socketServer = webServer.socket = new core_socket_server_1.default({
+        noServer: true,
+        perMessageDeflate: true
     })
         .on('connection', function connection(ws, req) {
-        ws.id = (0, uuid_1.v4)();
-        socketStore.set(ws.id, ws);
-        const userId = req.__userId;
-        if (!socketClients.get(userId))
-            socketClients.set(userId, new Set());
-        socketClients.get(userId).add(ws.id);
+        socketServer.addSocket(ws, req.__userId);
         sendWSResponse(ws, 'configuration:read', (0, configuration_read_socket_1.readConfiguration)());
         ws.on('error', console.error);
         ws.on('message', function message(stringData) {
             return __awaiter(this, void 0, void 0, function* () {
-                const info = JSON.parse(stringData);
+                const info = JSON.parse(stringData.toString());
                 const options = {
                     token: req.__token,
                     usageContext: (0, get_usage_context_1.default)(info.url),
@@ -81,20 +71,10 @@ function connectSocket(webServer) {
             });
         });
         ws.on('close', () => {
-            try {
-                socketStore.delete(ws.id);
-                socketClients[userId].delete(ws.id);
-            }
-            catch (e) {
-                console.log(e);
-            }
+            socketServer.deleteSocket(ws.id);
         });
     });
-    // @ts-ignore
-    socketServer._getClients = (id) => socketClients.get(id) && [...socketClients.get(id).values()].map(i => socketStore.get(i));
-    socketServer._getAll = () => [...socketClients.entries()];
-    socketServer.sockets = () => [...socketStore.values()];
-    httpServer.on('upgrade', function upgrade(request, socket, head) {
+    webServer.httpServer.on('upgrade', function upgrade(request, socket, head) {
         socket.on('error', onSocketError);
         /**
          * @description Фиктивная обёртка для authMiddleware. Т.к. в middleware происходит получение cookie, а в
@@ -136,6 +116,14 @@ function connectSocket(webServer) {
     });
 }
 exports.default = connectSocket;
+/**
+ * @description Функция при перехвате ошибки в сокете
+ */
+function onSocketError(err) {
+    console.error(err);
+    const logger = winston_1.loggers.get('main');
+    logger.error(typeof err === 'string' ? err : err instanceof Error ? err.message : err);
+}
 function wrapResponse(ws, requestId, defaultEvent) {
     return (response, event) => {
         sendWSResponse(ws, event || defaultEvent, response, requestId);

package/dist/socket/connect-socket.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}

package/dist/socket/core-socket-server.d.ts

@@ -0,0 +1,32 @@
+import { WebSocket, WebSocketServer } from "ws";
+import { UserId } from "../Server";
+export default class CoreSocketServer extends WebSocketServer {
+    /**
+     * @description Метод по переданному идентификатору пользователя возвращает массив сокетов пользователя.
+     * */
+    getByClientId(clientId: UserId): WebSocket[];
+    /**
+     * @description Метод возвращает все сокеты.
+     * */
+    getAllSockets(): WebSocket[];
+    /**
+     * @description Хранит все сокет соединения
+     * */
+    socketStore: Map<CoreSocketId, WebSocket>;
+    /**
+     * @description Перечисление, где ключом выступает массив идентификатор пользователя, а значением - Набор сокетов
+     * используемых этим пользователем
+     * */
+    socketClients: Map<UserId, Set<CoreSocketId>>;
+    /**
+     * @description Метод добавляет сокет в харинилище. Также связывает его и устаналивает уникальный ID
+     * */
+    addSocket(ws: WebSocket, userId: UserId): void;
+    /**
+     * @description Начисто удаляет сокет соединение по ws-id
+     * */
+    deleteSocket(socketId: string): void;
+}
+declare type CoreSocketId = string;
+export {};
+//# sourceMappingURL=core-socket-server.d.ts.map

package/dist/socket/core-socket-server.d.ts.map

@@ -0,0 +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,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,eAAe;IAEzD;;SAEK;IACL,aAAa,CAAC,QAAQ,EAAE,MAAM;IAM9B;;SAEK;IACL,aAAa;IAGb;;SAEK;IACL,WAAW,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAY;IACrD;;;SAGK;IACL,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAa;IAE1D;;SAEK;IACL,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;IAQvC;;SAEK;IACL,YAAY,CAAC,QAAQ,EAAE,MAAM;CAShC;AAED,aAAK,YAAY,GAAG,MAAM,CAAA"}

package/dist/socket/core-socket-server.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ws_1 = require("ws");
+const uuid_1 = require("uuid");
+class CoreSocketServer extends ws_1.WebSocketServer {
+    constructor() {
+        super(...arguments);
+        /**
+         * @description Хранит все сокет соединения
+         * */
+        this.socketStore = new Map();
+        /**
+         * @description Перечисление, где ключом выступает массив идентификатор пользователя, а значением - Набор сокетов
+         * используемых этим пользователем
+         * */
+        this.socketClients = new Map();
+    }
+    /**
+     * @description Метод по переданному идентификатору пользователя возвращает массив сокетов пользователя.
+     * */
+    getByClientId(clientId) {
+        if (!this.socketClients.has(clientId))
+            return [];
+        return [...this.socketClients.get(clientId)].map(socketId => this.socketStore.get(socketId));
+    }
+    /**
+     * @description Метод возвращает все сокеты.
+     * */
+    getAllSockets() {
+        return [...this.socketStore.values()];
+    }
+    /**
+     * @description Метод добавляет сокет в харинилище. Также связывает его и устаналивает уникальный ID
+     * */
+    addSocket(ws, userId) {
+        ws.id = (0, uuid_1.v4)();
+        ws.userId = userId;
+        this.socketStore.set(ws.id, ws);
+        if (!this.socketClients.get(userId))
+            this.socketClients.set(userId, new Set());
+        this.socketClients.get(userId).add(ws.id);
+    }
+    /**
+     * @description Начисто удаляет сокет соединение по ws-id
+     * */
+    deleteSocket(socketId) {
+        const socketInfo = this.socketStore.get(socketId);
+        this.socketStore.delete(socketId);
+        const userSockets = this.socketClients.get(socketInfo.userId);
+        if (!userSockets)
+            return;
+        userSockets.delete(socketId);
+    }
+}
+exports.default = CoreSocketServer;
+//# sourceMappingURL=core-socket-server.js.map

package/dist/socket/core-socket-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"core-socket-server.js","sourceRoot":"","sources":["../../src/socket/core-socket-server.ts"],"names":[],"mappings":";;AAAA,2BAA8C;AAE9C,+BAAkC;AAElC,MAAqB,gBAAiB,SAAQ,oBAAe;IAA7D;;QAiBI;;aAEK;QACL,gBAAW,GAAiC,IAAI,GAAG,EAAE,CAAA;QACrD;;;aAGK;QACL,kBAAa,GAAmC,IAAI,GAAG,EAAE,CAAC;IAyB9D,CAAC;IAhDG;;SAEK;IACL,aAAa,CAAC,QAAgB;QAC1B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,OAAO,EAAE,CAAC;QAEjD,OAAO,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjG,CAAC;IAED;;SAEK;IACL,aAAa;QACT,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;IACzC,CAAC;IAWD;;SAEK;IACL,SAAS,CAAC,EAAa,EAAE,MAAc;QACnC,EAAE,CAAC,EAAE,GAAG,IAAA,SAAM,GAAE,CAAC;QACjB,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC;QACnB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAEhC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QAC/E,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC;IACD;;SAEK;IACL,YAAY,CAAC,QAAgB;QACzB,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAElC,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC7D,IAAI,CAAC,WAAW;YAAE,OAAO;QAEzB,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;CACJ;AAlDD,mCAkDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eservices-back-core",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "",
   "main": "dist/Server.js",
   "scripts": {
@@ -60,6 +60,7 @@
     "@types/graphql": "^14.5.0",
     "@types/jest": "^29.5.0",
     "@types/uuid": "^8.3.4",
+    "@types/ws": "^8.5.7",
     "jest": "^29.5.0",
     "ts-jest": "^29.0.5",
     "tslint": "^6.1.3"

package/tsconfig.json

@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+        "skipLibCheck": true,
         "module": "commonjs",
         "esModuleInterop": true,
         "target": "es6",

package/dist/scripts/update-using-context.d.ts

@@ -1,3 +0,0 @@
-import Server from "../Server";
-export default function useUsingContext(server: Server): void;
-//# sourceMappingURL=update-using-context.d.ts.map

package/dist/scripts/update-using-context.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-using-context.d.ts","sourceRoot":"","sources":["../../src/scripts/update-using-context.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,WAAW,CAAC;AAe/B,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,MAAM,EAAE,MAAM,QAUrD"}

package/dist/scripts/update-using-context.js

@@ -1,25 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-function handle(server) {
-    const file = fs_1.default.readFileSync(server.options.usingContextFile, 'utf8');
-    const data = JSON.parse(file);
-    Object.keys(data).forEach(key => {
-        let value = data[key];
-        if (typeof value === 'string')
-            value = [value];
-        server.usingContextStore[key] = value;
-    });
-}
-function useUsingContext(server) {
-    if (!server.options.usingContextFile) {
-        return;
-    }
-    fs_1.default.watch(server.options.usingContextFile, () => handle(server));
-    handle(server);
-}
-exports.default = useUsingContext;
-//# sourceMappingURL=update-using-context.js.map

package/dist/scripts/update-using-context.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-using-context.js","sourceRoot":"","sources":["../../src/scripts/update-using-context.ts"],"names":[],"mappings":";;;;;AACA,4CAAoB;AAEpB,SAAS,MAAM,CAAC,MAAc;IAC7B,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACtE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE9B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;QAE/C,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACvC,CAAC,CAAC,CAAA;AACH,CAAC;AAED,SAAwB,eAAe,CAAC,MAAc;IAGrD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE;QACrC,OAAO;KACP;IAED,YAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAC/D,MAAM,CAAC,MAAM,CAAC,CAAC;AAEhB,CAAC;AAVD,kCAUC"}

package/dist/socket/namespaces/index-namespace.d.ts

@@ -1,4 +0,0 @@
-import { Server } from "socket.io";
-declare const _default: (io: Server) => void;
-export default _default;
-//# sourceMappingURL=index-namespace.d.ts.map

package/dist/socket/namespaces/index-namespace.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index-namespace.d.ts","sourceRoot":"","sources":["../../../src/socket/namespaces/index-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;6BAIb,MAAM;AAA1B,wBASC"}

package/dist/socket/namespaces/index-namespace.js

@@ -1,14 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const store_1 = require("../../store");
-const Store_1 = __importDefault(require("../../store/Store"));
-exports.default = (io) => {
-    io.on('connection', socket => {
-        const state = store_1.store.getState();
-        socket.emit("server-configuration:update", JSON.stringify(Object.assign(Object.assign({}, state.webServerConfiguration), { navigation: Store_1.default.viewNavigation, notification: Store_1.default.viewNotification })));
-    });
-};
-//# sourceMappingURL=index-namespace.js.map

package/dist/socket/namespaces/index-namespace.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index-namespace.js","sourceRoot":"","sources":["../../../src/socket/namespaces/index-namespace.ts"],"names":[],"mappings":";;;;;AACA,uCAAkC;AAClC,8DAAsC;AAEtC,kBAAe,CAAC,EAAU,EAAE,EAAE;IAC1B,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE;QACzB,MAAM,KAAK,GAAG,aAAK,CAAC,QAAQ,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,IAAI,CAAC,SAAS,iCAClD,KAAK,CAAC,sBAAsB,KAC/B,UAAU,EAAE,eAAK,CAAC,cAAc,EAChC,YAAY,EAAE,eAAK,CAAC,gBAAgB,IACtC,CAAC,CAAA;IACP,CAAC,CAAC,CAAA;AACN,CAAC,CAAA"}

package/dist/socket/use-socket.d.ts

@@ -1,2 +0,0 @@
-export default function useSocket(): void;
-//# sourceMappingURL=use-socket.d.ts.map

package/dist/socket/use-socket.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-socket.d.ts","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,OAAO,UAAW,SAAS,SAcjC"}

package/dist/socket/use-socket.js

@@ -1,27 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const session_middleware_1 = __importDefault(require("../middleware/session-middleware"));
-const default_namespace_1 = __importDefault(require("./namespaces/default-namespace"));
-const api_error_1 = __importDefault(require("../errors/api-error"));
-const Server_1 = __importDefault(require("../Server"));
-const index_namespace_1 = __importDefault(require("./namespaces/index-namespace"));
-const wrap = middleware => (socket, next) => middleware(socket.request, {}, next);
-function useSocket() {
-    const io = Server_1.default.getServer().socket;
-    (0, index_namespace_1.default)(io
-        .use(wrap(session_middleware_1.default))
-        .use(wrap(authSocketMiddleware)));
-    (0, default_namespace_1.default)(io.of('default')
-        .use(wrap(session_middleware_1.default))
-        .use(wrap(authSocketMiddleware)));
-}
-exports.default = useSocket;
-function authSocketMiddleware(req, res, next) {
-    if (req.session.userId)
-        return next();
-    next(api_error_1.default.UnauthorizedAccess('socket server'));
-}
-//# sourceMappingURL=use-socket.js.map

package/dist/socket/use-socket.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-socket.js","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":";;;;;AAAA,0FAAiE;AAEjE,uFAA8D;AAE9D,oEAA2C;AAC3C,uDAA+B;AAC/B,mFAA0D;AAE1D,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,SAAyB,SAAS;IACjC,MAAM,EAAE,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC;IAErC,IAAA,yBAAc,EACb,EAAE;SACA,GAAG,CAAC,IAAI,CAAC,4BAAiB,CAAC,CAAC;SAC5B,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CACjC,CAAA;IACD,IAAA,2BAAgB,EACf,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;SACd,GAAG,CAAC,IAAI,CAAC,4BAAiB,CAAC,CAAC;SAC5B,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CACjC,CAAC;AAEH,CAAC;AAdD,4BAcC;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/dist/types/index.d.ts

@@ -1,12 +0,0 @@
-import { ConfigParams } from "express-openid-connect";
-export declare type ServerType = 'back' | 'front';
-export interface ServerParams {
-    port: number;
-    baseUrl: string;
-    type: ServerType;
-    frontendDir: string;
-    projectDir: string;
-    apiUrl: string;
-    oidc: ConfigParams;
-}
-//# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAwBpD,oBAAY,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA;AAEzC,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,YAAY,CAAC;CACtB"}

package/dist/types/index.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=index.js.map

package/dist/types/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":""}

package/dist/utils/graphql-utils.d.ts

@@ -1,9 +0,0 @@
-interface ParseJSONConfigInterface {
-    [name: string]: boolean | ParseJSONConfigInterface;
-}
-export default class GraphqlUtils {
-    static parseToGraphQLFields(a: string[]): string;
-    static parseFields(fields: string[]): ParseJSONConfigInterface;
-}
-export {};
-//# sourceMappingURL=graphql-utils.d.ts.map

package/dist/utils/graphql-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"graphql-utils.d.ts","sourceRoot":"","sources":["../../src/utils/graphql-utils.ts"],"names":[],"mappings":"AAAA,UAAU,wBAAwB;IACjC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,wBAAwB,CAAA;CAClD;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAChC,MAAM,CAAC,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM;IAuBhD,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,wBAAwB;CAsB9D"}

package/dist/utils/graphql-utils.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class GraphqlUtils {
-    static parseToGraphQLFields(a) {
-        const v = GraphqlUtils.parseFields(a);
-        function test(object) {
-            let str = '';
-            for (const key in object) {
-                if (typeof object[key] === 'boolean')
-                    str += ` ${key} `;
-                else {
-                    // @ts-ignore
-                    str += ` ${key} { ${test(object[key])} }`;
-                }
-            }
-            return str;
-        }
-        return test(v);
-    }
-    static parseFields(fields) {
-        function parseField(object, field) {
-            if (field.includes('.')) {
-                const pointPosition = field.indexOf('.');
-                const nextFields = field.substring(pointPosition + 1);
-                const currentField = field.substring(0, pointPosition);
-                if (!(currentField in object))
-                    object[currentField] = {};
-                parseField(object[currentField], nextFields);
-            }
-            else
-                object[field] = true;
-            return object;
-        }
-        return fields.reduce(parseField, {});
-    }
-}
-exports.default = GraphqlUtils;
-//# sourceMappingURL=graphql-utils.js.map

package/dist/utils/graphql-utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"graphql-utils.js","sourceRoot":"","sources":["../../src/utils/graphql-utils.ts"],"names":[],"mappings":";;AAIA,MAAqB,YAAY;IAChC,MAAM,CAAC,oBAAoB,CAAC,CAAW;QACtC,MAAM,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;QAErC,SAAS,IAAI,CAAC,MAAgC;YAE7C,IAAI,GAAG,GAAG,EAAE,CAAC;YAEb,KAAK,MAAM,GAAG,IAAI,MAAM,EAAG;gBAE1B,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;oBAAE,GAAG,IAAI,IAAI,GAAG,GAAG,CAAC;qBACnD;oBACJ,aAAa;oBACb,GAAG,IAAI,IAAI,GAAG,MAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAE,IAAI,CAAC;iBAC5C;aAED;YAED,OAAO,GAAG,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;IACf,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,MAAgB;QAElC,SAAS,UAAU,CAAC,MAAW,EAAE,KAAa;YAE7C,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACxB,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAEzC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;gBACtD,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;gBAEvD,IAAI,CAAC,CAAC,YAAY,IAAI,MAAM,CAAC;oBAAE,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;gBAEzD,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,CAAC;aAE7C;;gBAAM,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;YAE5B,OAAO,MAAM,CAAC;QACf,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAEtC,CAAC;CACD;AA9CD,+BA8CC"}