eservices-back-core 1.4.9 → 1.5.0

package/dist/Server.d.ts

@@ -1,121 +1,45 @@
-/// <reference types="node" />
-import { Express } from "express";
-import { Server as HTTPServer } from 'http';
-import CoreSocketServer from "./socket/core-socket-server";
-import { IAuthOptions } from "./auth/use-auth";
-export default class Server implements Omit<ServerOptions, "amqp" | "oidc"> {
-    defaultUsageContext: string;
-    /**
-     * @description Ссылка на express сервер.
-     */
-    app: Express;
-    /**
-     * @description Ссылка на httpServer, используется для socket.io
-     */
-    httpServer: HTTPServer;
-    /**
-     * @description Параметр идентификация web-server
-     */
-    type: ServerType;
-    /**
-     * @description Параметр идентифицирующий тип web-сервера. Используется для работы с AppServer.
-     */
-    get typeName(): 'BAP' | 'SCP';
-    /**
-     * @description Путь основного каталого, из которого было запущено приложение.
-     */
-    projectDir: string;
-    /**
-     * @description Путь к папке с front сборкой. Используется для Express для отдачи статических данных.
-     */
-    frontendDir: string;
-    /**
-     * @description Путь к статическим файлам. Значение по умолчанию(пока не изменяемое): static
-     */
-    staticDir: string;
-    /**
-     * @description Instance of WebSocketServer с модификациями
-     */
-    socket: CoreSocketServer;
-    /**
-     * @description API URL(App Server)
-     */
-    apiUrl: string;
-    /**
-     * @description Number of port
-     */
-    port: number;
-    /**
-     * @description Version of current realize.
-     */
-    version: string;
-    static getServer(): Server;
-    constructor(params: ServerOptions);
-    run(): void;
-    generateVersion(version: ServerOptions['version'], filepathBuildNumber: ServerOptions['filepathBuildNumber']): Promise<string>;
-}
-export declare function createServer(params: ServerOptions): Promise<Server>;
-export interface ServerOptions {
-    /**
-     * @description Версия текущего решения. Передаётся как String.
-     */
-    version: string;
-    /**
-     * @description Путь до файла в котором хранится номер сборки. Используется как добавочный сумматор для версии.
-     */
-    filepathBuildNumber?: string;
-    /**
-     * @description Порт на котором будет запущен веб-сервер
-     */
-    port: number;
-    /**
-     * @description Тип сервера. "back" For Close Office (Back Office). "front" For Open Office (Front Office).
-     */
-    type: ServerType;
-    /**
-     * @description Местоположение папки Frontend.
-     */
-    frontendDir: string;
-    /**
-     * @description Местоположение webserver проекта. Обычно это папка в которой находится файл package.json относящийся
-     * к webserver.
-     */
-    projectDir: string;
-    /**
-     * @description URL на котором расположен соответсвующее API AppServer.
-     */
-    apiUrl: string;
-    /**
-     * Конфигурация Open ID Client
-     */
-    oidc: IAuthOptions;
-    /**
-     * @description Конфигуарция подключения к RabbitMQ
-     */
-    amqp: {
-        /**
-         * @description Вирутальное пространство. По умолчанию "/"
-         */
-        vhost?: string;
-        username?: string;
-        password?: string;
-        /**
-         * @description hostname от URI подключения.
-         * @example http://localhost -> localhost
-         * @example https://aiti.eservices.dev:1998 -> aiti.eservices.dev:1998
-         */
-        hostname: string;
-        /**
-         * @description Строковое значение префикса для названия queue.
-         */
-        prefix?: string;
-        /**
-         * @description Название Exchange к которому будет собачиться наша очередь
-         */
-        exchange: string;
-    };
-    defaultUsageContext?: string;
-}
-export declare type ServerType = 'back' | 'front';
-export declare type UserId = number;
+/// <reference types="node" />
+/// <reference types="node/http" />
+/// <reference types="got/dist/source/core/utils/timed-out" />
+import { Express } from "express";
+import { Server as HTTPServer } from 'http';
+import CoreSocketServer from "./socket/core-socket-server";
+import { IServerParams, ServerType } from "./types/server-type";
+export default class Server {
+    /**
+     * @description Сервер создаётся единожды. Данная переменная хранит в себе ссылку на текущий экземпляр.
+     */
+    static instance: Server;
+    /**
+     * @description Параметры с которыми был запущен Server.
+     */
+    params: IServerParams;
+    /**
+     * @description Ссылка на express сервер.
+     */
+    app: Express;
+    /**
+     * @description Ссылка на httpServer
+     */
+    httpServer: HTTPServer;
+    /**
+     * @description Параметр идентификация web-server
+     */
+    type: ServerType;
+    /**
+     * @description Instance of WebSocketServer с модификациями
+     */
+    socket: CoreSocketServer;
+    get staticDir(): string;
+    /**
+     * @description Version of current realize.
+     */
+    version: string;
+    static getServer(): Server;
+    constructor(params: IServerParams);
+    run(): Promise<void>;
+    private generateVersion;
+}
+export declare function createServer(params: IServerParams): Promise<Server>;
+export 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;AAQhD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAI7C,MAAM,CAAC,OAAO,OAAO,MAAO,YAAW,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1E,mBAAmB,EAAE,MAAM,CAAA;IAE3B;;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;IAEd;;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;IAaG,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,CAAC;IACF,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,oBAAY,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA;AACzC,oBAAY,MAAM,GAAG,MAAM,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;AAQhD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,MAAM;IAE1B;;OAEG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,MAAM,EAAE,aAAa,CAAA;IAErB;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,gBAAgB,CAAA;IAExB,IAAI,SAAS,WAEZ;IAED;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,aAAa;IAqB3B,GAAG;YAoBK,eAAe;CAc7B;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,mBAcvD;AAID,MAAM,MAAM,MAAM,GAAG,MAAM,CAAA"}

package/dist/Server.js

@@ -1,109 +1,115 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServer = void 0;
-const express_1 = __importDefault(require("express"));
-const http_1 = __importDefault(require("http"));
-const use_logger_1 = __importStar(require("./logger/use-logger"));
-const router_1 = __importDefault(require("./router"));
-const path_1 = __importDefault(require("path"));
-const use_config_1 = __importDefault(require("./utils/use-config"));
-const fs_1 = __importDefault(require("fs"));
-const connect_socket_1 = __importDefault(require("./socket/connect-socket"));
-const connect_rabbit_1 = __importDefault(require("./rabbitmq/connect-rabbit"));
-const auth_middleware_1 = require("./middleware/auth-middleware");
-let serverLink = null;
-class Server {
-    constructor(params) {
-        serverLink = this;
-        Object.assign(this, params);
-        (0, use_logger_1.default)();
-        use_logger_1.Logger.info(`Server was created with params %o`, params);
-        this.app = (0, express_1.default)();
-        this.httpServer = http_1.default.createServer(this.app);
-        this.staticDir = path_1.default.join(params.projectDir, 'static');
-        (0, auth_middleware_1.initializeAuth)(params.oidc);
-        (0, connect_socket_1.default)(this);
-        (0, connect_rabbit_1.default)(this, params.amqp);
-    }
-    /**
-     * @description Параметр идентифицирующий тип web-сервера. Используется для работы с AppServer.
-     */
-    get typeName() {
-        return this.type === 'front' ? 'SCP' : 'BAP';
-    }
-    static getServer() {
-        return serverLink;
-    }
-    run() {
-        this.httpServer.listen(this.port, () => {
-            use_logger_1.Logger.info(`Server (%s) run on %d port`, this.type, this.port);
-        });
-        this.httpServer.on('error', err => {
-            use_logger_1.Logger.error(err);
-        });
-        this.httpServer.on('close', e => {
-            use_logger_1.Logger.info(`Server was stopped`, e);
-        });
-    }
-    generateVersion(version, filepathBuildNumber) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const buildNumber = filepathBuildNumber
-                ? yield fs_1.default.promises.readFile(filepathBuildNumber, { encoding: 'utf-8' }).catch(err => {
-                    console.warn(`Can't read filepathBuildNumber,`, err);
-                    return "0";
-                })
-                : "0";
-            this.version = [version, buildNumber].join('.');
-            use_logger_1.Logger.info(`Version of current solution %s`, this.version);
-            return this.version;
-        });
-    }
-}
-exports.default = Server;
-function createServer(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const server = new Server(params);
-        yield server.generateVersion(params.version, params.filepathBuildNumber);
-        (0, router_1.default)();
-        (0, use_config_1.default)();
-        server.run();
-        return server;
-    });
-}
-exports.createServer = createServer;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createServer = void 0;
+const express_1 = __importDefault(require("express"));
+const http_1 = __importDefault(require("http"));
+const use_logger_1 = __importStar(require("./logger/use-logger"));
+const router_1 = __importDefault(require("./router"));
+const path_1 = __importDefault(require("path"));
+const use_config_1 = __importDefault(require("./utils/use-config"));
+const fs_1 = __importDefault(require("fs"));
+const connect_socket_1 = __importDefault(require("./socket/connect-socket"));
+const connect_rabbit_1 = __importDefault(require("./rabbitmq/connect-rabbit"));
+const auth_middleware_1 = require("./middleware/auth-middleware");
+class Server {
+    get staticDir() {
+        return path_1.default.join(this.params.projectDir, 'static');
+    }
+    static getServer() {
+        return Server.instance;
+    }
+    constructor(params) {
+        /**
+         * Singleton instance
+         */
+        Server.instance = this;
+        this.params = params;
+        this.type = params.type;
+        (0, use_logger_1.default)();
+        use_logger_1.Logger.info(`Server was created with params %o`, params);
+        this.app = (0, express_1.default)();
+        this.httpServer = http_1.default.createServer(this.app);
+    }
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.generateVersion();
+            if (!this.params.port) {
+                use_logger_1.Logger.error(`Port is not provided for Server.`);
+                return;
+            }
+            this.httpServer.listen(this.params.port, () => {
+                use_logger_1.Logger.info(`Server (%s) run on %d port`, this.type, this.params.port);
+            });
+            this.httpServer.on('error', err => {
+                use_logger_1.Logger.error(err);
+            });
+            this.httpServer.on('close', e => {
+                use_logger_1.Logger.info(`Server was stopped`, e);
+            });
+        });
+    }
+    generateVersion() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { pathVersionFile, version } = this.params;
+            const buildNumber = pathVersionFile
+                ? yield fs_1.default.promises.readFile(pathVersionFile, { encoding: 'utf-8' }).catch(err => {
+                    use_logger_1.Logger.warn(`Can't read params.athVersionFile,`, err);
+                    return "0";
+                })
+                : "0";
+            this.version = [version, buildNumber].join('.');
+            use_logger_1.Logger.info(`Version of current solution %s`, this.version);
+            return this.version;
+        });
+    }
+}
+exports.default = Server;
+function createServer(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const server = new Server(params);
+        (0, auth_middleware_1.initializeAuth)(params.oidc);
+        (0, connect_socket_1.default)(server);
+        yield (0, connect_rabbit_1.default)(server, params.amqp);
+        (0, router_1.default)();
+        (0, use_config_1.default)();
+        yield server.run();
+        return server;
+    });
+}
+exports.createServer = createServer;
 //# sourceMappingURL=Server.js.map

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":"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"}

package/dist/app.d.ts

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=app.d.ts.map

package/dist/app.js

@@ -1,35 +1,34 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Server_1 = require("./Server");
-const path_1 = __importDefault(require("path"));
-const dotenv_1 = require("dotenv");
-(0, dotenv_1.config)({
-    path: path_1.default.join(__dirname, "..", ".env"),
-});
-console.log(`For retoken http://localhost:${process.env.PORT}/test-api/re-token`);
-(0, Server_1.createServer)({
-    version: "1.2.4",
-    port: Number(process.env.PORT),
-    type: process.env.TYPE,
-    apiUrl: process.env.API_URL,
-    projectDir: path_1.default.join(__dirname, ".."),
-    frontendDir: path_1.default.join(__dirname, "../..", "frontend"),
-    oidc: {
-        issuerBaseURL: process.env.OIDC_ISSUE,
-        baseURL: process.env.BASE_URL,
-        clientId: process.env.OIDC_CLIENT_ID,
-        clientSecret: process.env.OIDC_SECRET,
-    },
-    amqp: {
-        vhost: "ar-aiti-dev",
-        username: "ws",
-        password: "admin",
-        hostname: "104.41.213.67",
-        exchange: "AppRegister.Features.Notifications:DisplayMessageCreated"
-    },
-    defaultUsageContext: "Common"
-});
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Server_1 = require("./Server");
+const path_1 = __importDefault(require("path"));
+const dotenv_1 = require("dotenv");
+(0, dotenv_1.config)({
+    path: path_1.default.join(__dirname, "..", ".env"),
+});
+console.log(`For retoken http://localhost:${process.env.PORT}/test-api/re-token`);
+(0, Server_1.createServer)({
+    version: "1.2.4",
+    port: Number(process.env.PORT),
+    type: process.env.TYPE, // process.env.TYPE,
+    apiUrl: process.env.API_URL,
+    projectDir: path_1.default.join(__dirname, ".."),
+    frontendDir: path_1.default.join(__dirname, "../..", "frontend"),
+    oidc: {
+        issuerBaseURL: process.env.OIDC_ISSUE,
+        baseURL: process.env.BASE_URL,
+        clientId: process.env.OIDC_CLIENT_ID,
+        clientSecret: process.env.OIDC_SECRET,
+    },
+    amqp: {
+        vhost: "ar-aiti-dev",
+        username: "ws",
+        password: "admin",
+        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,EAAG,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC9B,QAAQ,EAAG,OAAO,CAAC,GAAG,CAAC,cAAc;QACrC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;KACrC;IACD,IAAI,EAAE;QACL,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,OAAO;QACjB,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,0DAA0D;KACpE;IACD,mBAAmB,EAAE,QAAQ;CAC7B,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,EAAE,oBAAoB;IAChE,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,EAAG,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC9B,QAAQ,EAAG,OAAO,CAAC,GAAG,CAAC,cAAc;QACrC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;KACrC;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/auth/use-auth.d.ts

@@ -1,43 +1,38 @@
-import { TokenSet } from 'openid-client';
-import { Request } from "express";
-declare const SESSION_KEY = "auth";
-declare global {
-    namespace Express {
-        interface Request {
-            session: {
-                [SESSION_KEY]: Partial<IAuthClientState>;
-            };
-        }
-    }
-}
-/**
- * @description Функция обёртка для подключения к ID server. Возвращает middleware для стандартного http подключения. А
- * также для WS.
- */
-export default function useAuth(options: IAuthOptions): {
-    useAuthMiddleware: () => import("express-serve-static-core").Router;
-    useWSAuthMiddleware: (req: Request) => Promise<void>;
-    silentLogout: (req: Request) => void;
-};
-interface IAuthClientState {
-    codeVerifier: string;
-    accessToken: string;
-    tokenType: string;
-    refreshToken: string;
-    expiresAt: number;
-    claims: ReturnType<TokenSet['claims']>;
-}
-export interface IAuthOptions {
-    baseURL: string;
-    issuerBaseURL: string;
-    clientId: string;
-    clientSecret: string;
-}
-/**
- * @description Возвращает набор данных связанных с авторизацией из сессии.
- */
-export declare function getAuthStateFormRequest(request: Request): Partial<IAuthClientState>;
-export declare function getFullAccessToken(request: Request): string;
-export declare function getUserIdFromAuthRequest(request: Request): number;
-export {};
+import { TokenSet } from 'openid-client';
+import { Request } from "express";
+import { IAuthOptions } from "../types/auth-type";
+declare const SESSION_KEY = "auth";
+declare global {
+    namespace Express {
+        interface Request {
+            session: {
+                [SESSION_KEY]: Partial<IAuthClientState>;
+            };
+        }
+    }
+}
+/**
+ * @description Функция обёртка для подключения к ID server. Возвращает middleware для стандартного http подключения. А
+ * также для WS.
+ */
+export default function useAuth(options: IAuthOptions): {
+    useAuthMiddleware: () => import("express-serve-static-core").Router;
+    useWSAuthMiddleware: (req: Request) => Promise<void>;
+    silentLogout: (req: Request) => void;
+};
+interface IAuthClientState {
+    codeVerifier: string;
+    accessToken: string;
+    tokenType: string;
+    refreshToken: string;
+    expiresAt: number;
+    claims: ReturnType<TokenSet['claims']>;
+}
+/**
+ * @description Возвращает набор данных связанных с авторизацией из сессии.
+ */
+export declare function getAuthStateFormRequest(request: Request): any;
+export declare function getFullAccessToken(request: Request): string;
+export declare function getUserIdFromAuthRequest(request: Request): number;
+export {};
 //# sourceMappingURL=use-auth.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAE7E,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAMzC,QAAA,MAAM,WAAW,SAAS,CAAC;AAK3B,OAAO,CAAC,MAAM,CAAA;IACb,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,OAAO,EAAE;gBACR,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;aACxC,CAAA;SACD;KACD;CACD;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+BAyHZ,OAAO;wBAqBpB,OAAO;EASlC;AAQD,UAAU,gBAAgB;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;CACtC;AACD,MAAM,WAAW,YAAY;IAC5B,OAAO,EAAC,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAA;CACpB;AA2BD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,6BAMvD;AAqBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAElD;AACD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,UAGxD"}
+{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAE7E,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAIzC,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAIhD,QAAA,MAAM,WAAW,SAAS,CAAC;AAK3B,OAAO,CAAC,MAAM,CAAA;IACb,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,OAAO,EAAE;gBACR,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;aACxC,CAAA;SACD;KACD;CACD;AAID;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+BAyHZ,OAAO;wBAqBpB,OAAO;EASlC;AAQD,UAAU,gBAAgB;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;CACtC;AA6BD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,OAMvD;AAqBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAElD;AACD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,UAGxD"}